[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/07/15 11:48:21

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonSwarming.ml 
        src/gtk2/gui   : guiConsole.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/networks/donkey: donkeyInteractive.ml 
        src/networks/fileTP: fileTPInteractive.ml 
        src/utils/cdk  : printf2.ml 

Log message:
        patch #5242

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.915&r2=1.916
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSwarming.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiConsole.ml?cvsroot=mldonkey&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPInteractive.ml?cvsroot=mldonkey&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/printf2.ml?cvsroot=mldonkey&r1=1.18&r2=1.19

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -b -r1.915 -r1.916
--- distrib/ChangeLog   15 Jul 2006 11:46:57 -0000      1.915
+++ distrib/ChangeLog   15 Jul 2006 11:48:20 -0000      1.916
@@ -15,6 +15,8 @@
 =========
 
 2006/07/15
+5242: GTK2 GUI: Remove unnecessary linefeed in console,
+      remove some log and compiler warnings
 5239: GTK2 GUI: Fix result sorting,
       update search results instead of double display (su_blanc)
 

Index: src/daemon/common/commonSwarming.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSwarming.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/daemon/common/commonSwarming.ml 12 Jun 2006 11:34:39 -0000      1.44
+++ src/daemon/common/commonSwarming.ml 15 Jul 2006 11:48:20 -0000      1.45
@@ -1982,12 +1982,6 @@
                ) 0 s.s_networks
              ))
          else [||] in
-       let completed_blocks_in_chunk = 
-         Array.init my_t.t_nchunks (fun i ->
-            lazy (
-              List.fold_left (fun acc b ->
-               if VB.get s.s_verified_bitmap b = VB.State_complete then acc + 
1 else acc
-              ) 0 my_t.t_blocks_of_chunk.(i))) in
 
        let preview_beginning = 10000000L in
        let preview_end = (s.s_size ** 98L) // 100L in
@@ -2002,7 +1996,6 @@
          | _ -> assert false in
 
        let evaluate_choice n b =
-         let nchunk = my_t.t_chunk_of_block.(b) in
          let block_begin = compute_block_begin s b in
          let block_end = compute_block_end s b in
          let size = block_end -- block_begin in

Index: src/gtk2/gui/guiConsole.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiConsole.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/gtk2/gui/guiConsole.ml  12 Nov 2005 11:16:36 -0000      1.3
+++ src/gtk2/gui/guiConsole.ml  15 Jul 2006 11:48:21 -0000      1.4
@@ -139,7 +139,7 @@
 
 let insert t =
   let iter = text_buffer#get_iter `END in
-  let s = (U.utf8_of t) ^ "\n" in
+  let s = (U.utf8_of t) in
   text_buffer#insert ~iter s
 
 (*************************************************************************)

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- src/networks/bittorrent/bTInteractive.ml    27 Jun 2006 20:25:51 -0000      
1.98
+++ src/networks/bittorrent/bTInteractive.ml    15 Jul 2006 11:48:21 -0000      
1.99
@@ -292,10 +292,6 @@
 
   if Hashtbl.length file.file_clients > 0 then begin
 
-      let chunks = (match file.file_swarmer with
-            None -> "" | Some swarmer ->
-              VB.to_string (CommonSwarming.chunks_verified_bitmap swarmer)) in
-
       let header_list = [
         ( "1", "srh br ac", "Client number", "Num" ) ;
         ( "0", "srh br", "Client UID", "UID" ) ;
@@ -1083,6 +1079,7 @@
   network.op_network_connected <- op_network_connected;
   network.op_network_parse_url <- op_network_parse_url;
   network.op_network_share <- (fun fullname codedname size -> ());
+  network.op_network_close_search <- (fun s -> ());
   network.op_network_forget_search <- (fun s -> ());
   network.op_network_connect_servers <- (fun s -> ());
   network.op_network_search <- (fun ss buf -> ());

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- src/networks/donkey/donkeyInteractive.ml    14 Jul 2006 13:24:24 -0000      
1.111
+++ src/networks/donkey/donkeyInteractive.ml    15 Jul 2006 11:48:21 -0000      
1.112
@@ -1532,6 +1532,7 @@
 
   network.op_network_parse_url <- parse_donkey_url;
 
+  network.op_network_close_search <- (fun s -> ());
   network.op_network_forget_search <- forget_search
 
 (* emule<->mldonkey disconnects during chat, and this doesn't seem to auto 
reconnect

Index: src/networks/fileTP/fileTPInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- src/networks/fileTP/fileTPInteractive.ml    11 Jun 2006 17:37:39 -0000      
1.40
+++ src/networks/fileTP/fileTPInteractive.ml    15 Jul 2006 11:48:21 -0000      
1.41
@@ -420,6 +420,7 @@
   );
   file_ops.op_file_resume <- (fun file -> ());
   file_ops.op_file_print_html <- (fun file buf -> ());
+  network.op_network_close_search <- (fun s -> ());
   network.op_network_forget_search <- (fun s -> ());
   network.op_network_connect_servers <- (fun s -> ());
   network.op_network_recover_temp <- (fun s -> ())

Index: src/utils/cdk/printf2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/printf2.ml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/utils/cdk/printf2.ml    14 Jul 2006 14:23:37 -0000      1.18
+++ src/utils/cdk/printf2.ml    15 Jul 2006 11:48:21 -0000      1.19
@@ -228,8 +228,7 @@
 
 let keep_console_output () =
   match !lprintf_original_output with
-    Some stdout -> true
-  | Some stderr -> true
+    Some c when c = stderr || c = stdout -> true
   | _ -> false
 
 let _ =