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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/12/17 11:35:56

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml commonServer.ml 

Log message:
        patch #6342

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1336&r2=1.1337
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonServer.ml?cvsroot=mldonkey&r1=1.43&r2=1.44

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1336
retrieving revision 1.1337
diff -u -b -r1.1336 -r1.1337
--- distrib/ChangeLog   17 Dec 2007 11:32:27 -0000      1.1336
+++ distrib/ChangeLog   17 Dec 2007 11:35:56 -0000      1.1337
@@ -15,6 +15,7 @@
 =========
 
 2007/12/17
+6342: HTML: fix broken vm output in Opera (schlumpf)
 6346: Environment variables for file_started_cmd (see option help text)
 
 2007/12/13

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- src/daemon/common/commonInteractive.ml      17 Dec 2007 11:32:27 -0000      
1.102
+++ src/daemon/common/commonInteractive.ml      17 Dec 2007 11:35:56 -0000      
1.103
@@ -625,7 +625,6 @@
           List.mem NetworkHasSupernodes r.network_flags
         then begin
            if use_html_mods o then begin
-               Printf.bprintf buf "\\<div class=servers\\>";
                html_mods_table_one_row buf "serversTable" "servers" [
                  ("", "srh", Printf.sprintf (_b "--- Connected to %d servers 
on the %s network ---\n")
                    (List.length list) r.network_name); ]
@@ -633,7 +632,6 @@
            else
              Printf.bprintf buf (_b "--- Connected to %d servers on the %s 
network ---\n")
                (List.length list) r.network_name;
-           if use_html_mods o then Printf.bprintf buf "\\</div\\>";
           end;
          if use_html_mods o && List.length list > 0 then 
server_print_html_header buf "C";
 

Index: src/daemon/common/commonServer.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonServer.ml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/daemon/common/commonServer.ml   31 May 2007 19:24:57 -0000      1.43
+++ src/daemon/common/commonServer.ml   17 Dec 2007 11:35:56 -0000      1.44
@@ -427,7 +427,7 @@
     Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\""
     (html_mods_cntr ());
 
-    (if !!html_mods_use_js_tooltips then
+    if !!html_mods_use_js_tooltips then
        Printf.bprintf buf " 
onMouseOver=\\\"mOvr(this);setTimeout('popLayer(\\\\\'%s 
%s<br>%s\\\\\')',%d);setTimeout('hideLayer()',%d);return true;\\\" 
onMouseOut=\\\"mOut(this);hideLayer();setTimeout('hideLayer()',%d)\\\"\\>"
         info.G.server_name ip_port_string 
        (match info.G.server_features with
@@ -435,10 +435,10 @@
        | Some f -> "server features: " ^ f)
        !!html_mods_js_tooltips_wait
        !!html_mods_js_tooltips_timeout
-       !!html_mods_js_tooltips_wait);
+       !!html_mods_js_tooltips_wait
+    else Printf.bprintf buf "\\>";
 
-    Printf.bprintf buf 
-" \\<td class=\\\"srb\\\" %s \\>%d\\</td\\> %s %s %s"
+    Printf.bprintf buf " \\<td class=\\\"srb\\\" %s \\>%d\\</td\\> %s %s %s"
     (match impl.impl_server_state with
         Connected _ -> 
             Printf.sprintf "title=\\\"Server Banner\\\"