[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/02 20:51:08

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml 
        src/networks/bittorrent: bTInteractive.ml 

Log message:
        patch #5847

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1220&r2=1.1221
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.225&r2=1.226
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.131&r2=1.132

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1220
retrieving revision 1.1221
diff -u -b -r1.1220 -r1.1221
--- distrib/ChangeLog   2 Apr 2007 19:45:46 -0000       1.1220
+++ distrib/ChangeLog   2 Apr 2007 20:51:08 -0000       1.1221
@@ -15,7 +15,8 @@
 =========
 
 2007/04/02:
-5845: Do not reverse order in files.ini after restart
+5847: BT: Fix exceptions when handling BT clients as friends
+5845: Do not reverse order in files.ini after restart (pango)
 5844: HTML: Keep totals line when sorting statistics tables (schlumpf)
 -------------------------------------------------------------------------------
 2007/04/01: version 2.8.4 = tag release-2-8-4

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- src/daemon/driver/driverCommands.ml 2 Apr 2007 18:53:33 -0000       1.225
+++ src/daemon/driver/driverCommands.ml 2 Apr 2007 20:51:08 -0000       1.226
@@ -986,7 +986,7 @@
                   i.client_name
                   i.client_num
 
-                  (let rs = client_files c in
+                  (let rs = try client_files c with _ -> [] in
                   if (List.length rs) > 0 then Printf.sprintf "%d Files 
Listed" (List.length rs)
                   else string_of_connection_state (client_state c) )
 

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- src/networks/bittorrent/bTInteractive.ml    1 Apr 2007 12:14:57 -0000       
1.131
+++ src/networks/bittorrent/bTInteractive.ml    2 Apr 2007 20:51:08 -0000       
1.132
@@ -1302,6 +1302,10 @@
   client_ops.op_client_bprint <- op_client_bprint;
   client_ops.op_client_dprint <- op_client_dprint;
   client_ops.op_client_dprint_html <- op_client_dprint_html;
+  client_ops.op_client_browse <- (fun _ _ -> ());
+  client_ops.op_client_files <- (fun _ -> []);
+  client_ops.op_client_clear_files <- (fun _ -> ());
+  client_ops.op_client_to_option <- (fun _ -> []);
 
   CommonNetwork.register_commands commands;