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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/30 10:55:21

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

Log message:
        patch #5137

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.855&tr2=1.856&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.148&tr2=1.149&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.79&tr2=1.80&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.855 mldonkey/distrib/ChangeLog:1.856
--- mldonkey/distrib/ChangeLog:1.855    Tue May 30 10:54:14 2006
+++ mldonkey/distrib/ChangeLog  Tue May 30 10:55:21 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/30
+5137: HTML: Fix display of file magic values with '
 5136: FileTP: fixes and enhancements (zet)
 * Add "FTP-chunk_size" option (0 = no chunks = download full file at once)
 -- A chunk_size would be required if downloading from > 1 source
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.148 
mldonkey/src/daemon/driver/driverCommands.ml:1.149
--- mldonkey/src/daemon/driver/driverCommands.ml:1.148  Thu May 25 19:53:33 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Tue May 30 10:55:21 2006
@@ -2311,7 +2311,7 @@
                         (Http_server.html_real_escaped (Filename.basename 
impl.impl_shared_codedname))
                        (match impl.impl_shared_magic with
                           None -> ""
-                        | Some magic -> "File type: " ^ magic ^ "<br>")
+                        | Some magic -> "File type: " ^ 
(Http_server.html_real_escaped magic) ^ "<br>")
                        !!html_mods_js_tooltips_wait
                        !!html_mods_js_tooltips_timeout
                        !!html_mods_js_tooltips_wait
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.79 
mldonkey/src/daemon/driver/driverInteractive.ml:1.80
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.79        Tue May 23 
17:38:26 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Tue May 30 10:55:21 2006
@@ -688,7 +688,7 @@
                         (Http_server.html_real_escaped file.file_name)
                        (match file_magic (file_find file.file_num) with
                           None -> ""
-                        | Some magic -> "File type: " ^ magic ^ "<br>")
+                        | Some magic -> "File type: " ^ 
(Http_server.html_real_escaped magic) ^ "<br>")
                        file.file_num
                         (net_name file)
                        !!html_mods_js_tooltips_wait