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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/07 14:37:17

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonClient.ml 
        src/daemon/driver: driverCommands.ml 

Log message:
        patch #4769

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.661&tr2=1.662&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonClient.ml.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.111&tr2=1.112&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.661 mldonkey/distrib/ChangeLog:1.662
--- mldonkey/distrib/ChangeLog:1.661    Fri Jan  6 22:32:36 2006
+++ mldonkey/distrib/ChangeLog  Sat Jan  7 14:37:16 2006
@@ -11,6 +11,9 @@
 To compile MLDonkey on MinGW follow this guide:
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
+2006/01/07
+4769: HTML: Fix some Geoip display bugs
+
 2006/01/06
 4768: Dynamic loop delay (pango)
 4765: Add GeoIP.dat support (zet)
Index: mldonkey/src/daemon/common/commonClient.ml
diff -u mldonkey/src/daemon/common/commonClient.ml:1.23 
mldonkey/src/daemon/common/commonClient.ml:1.24
--- mldonkey/src/daemon/common/commonClient.ml:1.23     Fri Jan  6 22:23:08 2006
+++ mldonkey/src/daemon/common/commonClient.ml  Sat Jan  7 14:37:16 2006
@@ -422,15 +422,14 @@
   let n = impl.impl_client_ops.op_client_network in
   let info = client_info c in
   let buf = o.conn_buf in
+  let ips,cc,cn = string_of_kind_geo info.G.client_kind in
   if use_html_mods o then begin
-       html_mods_td buf [
+       html_mods_td buf ([
        ("", "sr", Printf.sprintf "%d" (client_num c));
        ("", "sr", n.network_name);
-       ("", "sr", (try match info.G.client_kind with
-             Known_location (ip,port) -> Printf.sprintf "%s" (Ip.to_string ip)
-           | Indirect_location _ -> Printf.sprintf "None"
-           with _ -> ""));
-       (String.escaped info.G.client_name, "sr", client_short_name 
info.G.client_name); ];
+       ("", "sr", ips);
+       ] @ (if !Geoip.active then [(cn, "sr", cc)] else []) @ [
+       (String.escaped info.G.client_name, "sr", client_short_name 
info.G.client_name); ]);
     end
   else begin
       Printf.bprintf buf "[%s%6d] Name  : %-27s Rating  : %-10d  IP   : %-20s"
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.111 
mldonkey/src/daemon/driver/driverCommands.ml:1.112
--- mldonkey/src/daemon/driver/driverCommands.ml:1.111  Fri Jan  6 22:23:09 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Sat Jan  7 14:37:16 2006
@@ -2263,6 +2263,7 @@
                   ( "0", "srh", "Secure User Identification [N]one, [P]assed, 
[F]ailed", "S" ) ;
                   ( "0", "srh", "IP address", "IP address" ) ;
                   ( "0", "srh", "Connected time (minutes)", "CT" ) ;
+                 ] @ (if !Geoip.active then [( "0", "srh", "Country 
Code/Name", "CC" )] else []) @ [
                   ( "0", "srh", "Client brand", "CB" ) ;
                   ( "0", "srh", "Client release", "CR" ) ;
                   ] @