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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       12/06/24 08:09:08

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

Log message:
        patch #7804

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1559&r2=1.1560
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.241&r2=1.242
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.265&r2=1.266

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1559
retrieving revision 1.1560
diff -u -b -r1.1559 -r1.1560
--- distrib/ChangeLog   24 Jun 2012 08:08:11 -0000      1.1559
+++ distrib/ChangeLog   24 Jun 2012 08:09:07 -0000      1.1560
@@ -15,6 +15,7 @@
 =========
 
 2012/06/24
+7804: new option filenames_utf8 (ygrek)
 7803: pause conditions: "pause where priority < X" (ygrek)
 7802: Do not leave empty files if code generation fails (ygrek)
 7801: HTML: Fix content-type for 401 error (ygrek)

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- src/daemon/common/commonInteractive.ml      24 Jun 2012 07:59:40 -0000      
1.113
+++ src/daemon/common/commonInteractive.ml      24 Jun 2012 08:09:07 -0000      
1.114
@@ -84,7 +84,7 @@
         Charset.add_uchar buf uc'
       end
   done;
-  if not Autoconf.windows then
+  if not Autoconf.windows && not !!filenames_utf8 then
     Charset.Locale.to_locale (Buffer.contents buf)
   else
     Buffer.contents buf (* Windows uses patched OCaml which always uses 
Unicode chars *)

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- src/daemon/common/commonOptions.ml  25 Oct 2011 19:06:15 -0000      1.241
+++ src/daemon/common/commonOptions.ml  24 Jun 2012 08:09:07 -0000      1.242
@@ -1396,8 +1396,9 @@
   "Name of GUI to start"
     string_option (Filename.concat bin_dir "mlgui")
 
-
-
+let filenames_utf8 = define_option current_section ["filenames_utf8"]
+  "Use UTF-8 for filenames (instead of automatic locale detection)."
+    bool_option false
 
 (*************************************************************************)
 (*                                                                       *)

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -b -r1.265 -r1.266
--- src/daemon/driver/driverCommands.ml 24 Jun 2012 08:08:11 -0000      1.265
+++ src/daemon/driver/driverCommands.ml 24 Jun 2012 08:09:08 -0000      1.266
@@ -2088,6 +2088,7 @@
                       [
                        strings_of_option previewer;
                        strings_of_option temp_directory;
+                       strings_of_option filenames_utf8;
                        strings_of_option share_scan_interval;
                        strings_of_option hdd_temp_minfree;
                        strings_of_option hdd_temp_stop_core;