[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/03/10 19:23:54

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTGlobals.ml 

Log message:
        patch #7496

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1517&r2=1.1518
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTGlobals.ml?cvsroot=mldonkey&r1=1.88&r2=1.89

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1517
retrieving revision 1.1518
diff -u -b -r1.1517 -r1.1518
--- distrib/ChangeLog   10 Mar 2011 19:18:23 -0000      1.1517
+++ distrib/ChangeLog   10 Mar 2011 19:23:54 -0000      1.1518
@@ -15,6 +15,7 @@
 =========
 
 2011/03/10
+7496: BT: stop asking users to submit unknown client ids (ygrek)
 7495: Fix compilation of Ocaml 3.12.0 with recent binutils (ecc, glondu)
 7494: GTK2 GUI: fix too obtrusive splash window (bugmenot, ygrek)
 7493: BT: open DHT port by UPnP (tathar)

Index: src/networks/bittorrent/bTGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- src/networks/bittorrent/bTGlobals.ml        23 Jan 2011 15:20:26 -0000      
1.88
+++ src/networks/bittorrent/bTGlobals.ml        10 Mar 2011 19:23:54 -0000      
1.89
@@ -784,15 +784,16 @@
 
 let parse_software s =
   let default = (Brand_unknown, "") in
-  let rec iter l =
-    match l with
-      [] -> lprintf_nl "Unknown BT client software version, report the next 
line to http://mldonkey.sourceforge.net/UnknownBtClients%s\nBTUC:\"%s\""; 
Autoconf.current_version (String.escaped s);
+  let rec iter = function
+  | [] ->
+    if !verbose_msg_clienttags then lprintf_nl "BTUC: %S" s;
             default
-      | d :: t -> match (d s) with 
+  | d :: t ->
+    match (d s) with
                   | None    -> iter t
-                  | Some bv -> let (brand, version) = bv in
+    | Some (brand, version as bv) ->
                                if !verbose_msg_clienttags then
-                                 lprintf_nl "BTKC:\"%s\"; ID: \"%s\"; 
version:\"%s\"" (String.escaped s) (brand_to_string brand) version;
+        lprintf_nl "BTKC: %S; ID: %S; version: %S" s (brand_to_string brand) 
version;
                                bv
   in
   if Sha1.direct_of_string s = Sha1.null then