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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/13 13:08:43

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInteractive.ml 

Log message:
        patch #5547

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1085&r2=1.1086
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.113&r2=1.114

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -b -r1.1085 -r1.1086
--- distrib/ChangeLog   12 Nov 2006 14:04:02 -0000      1.1085
+++ distrib/ChangeLog   13 Nov 2006 13:08:42 -0000      1.1086
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/11/13
+5547: HTML: Fix unicode display in vd & upstats javascript popups
+
 2006/11/12
 5545: EDK: Do not show empty server message lines in GUI
 5509: Common: Merge file_print functions,

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- src/daemon/driver/driverInteractive.ml      9 Nov 2006 21:32:26 -0000       
1.113
+++ src/daemon/driver/driverInteractive.ml      13 Nov 2006 13:08:43 -0000      
1.114
@@ -721,7 +721,7 @@
           (if !!html_mods_use_js_tooltips then
                         Printf.sprintf "
                                 
onMouseOver=\\\"mOvr(this);setTimeout('popLayer(\\\\\'%s<br>%sFile#: 
%d<br>Network: %s<br>User%s 
%s%s%s\\\\\')',%d);setTimeout('hideLayer()',%d);return true;\\\" 
onMouseOut=\\\"mOut(this);hideLayer();setTimeout('hideLayer()',%d)\\\"\\>"
-                        (Http_server.html_real_escaped file.file_name)
+                        (Http_server.html_real_escaped (Charset.to_utf8 
file.file_name))
                        (match file_magic (file_find file.file_num) with
                           None -> ""
                         | Some magic -> "File type: " ^ 
(Http_server.html_real_escaped magic) ^ "<br>")
@@ -2474,7 +2474,7 @@
        Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"" (html_mods_cntr ());
        (if !!html_mods_use_js_tooltips then
           Printf.bprintf buf " 
onMouseOver=\\\"mOvr(this);setTimeout('popLayer(\\\\\'%s<br>%s%s\\\\\')',%d);setTimeout('hideLayer()',%d);return
 true;\\\" 
onMouseOut=\\\"mOut(this);hideLayer();setTimeout('hideLayer()',%d)\\\"\\>"
-           (Http_server.html_real_escaped (Filename.basename 
impl.impl_shared_codedname))
+           (Http_server.html_real_escaped (Filename.basename (Charset.to_utf8 
impl.impl_shared_codedname)))
            (match impl.impl_shared_magic with
               None -> ""
             | Some magic -> "File type: " ^ (Http_server.html_real_escaped 
magic) ^ "<br>")