[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/option...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/31 22:26:05

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : options.ml4 options.mli 

Log message:
        patch #5151

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.867&tr2=1.868&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/options.ml4.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/options.mli.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.867 mldonkey/distrib/ChangeLog:1.868
--- mldonkey/distrib/ChangeLog:1.867    Wed May 31 22:25:31 2006
+++ mldonkey/distrib/ChangeLog  Wed May 31 22:26:05 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/06/01
+5151: Options: New stringvalue functions needed for multiuser support
 5150: Log: Fix log when server list is empty in check_blocked_servers
 
 2006/05/31
Index: mldonkey/src/utils/lib/options.ml4
diff -u mldonkey/src/utils/lib/options.ml4:1.20 
mldonkey/src/utils/lib/options.ml4:1.21
--- mldonkey/src/utils/lib/options.ml4:1.20     Thu Apr  6 21:46:56 2006
+++ mldonkey/src/utils/lib/options.ml4  Wed May 31 22:26:05 2006
@@ -474,6 +474,16 @@
 let ( !! ) o = o.option_value
 let ( =:= ) o v = o.option_value <- v; exec_chooks o; exec_hooks o
     
+let stringvalue_to_option v =
+  match v with
+    StringValue s -> if s = "None" then None else Some s
+  | _ -> failwith "Not a string option"
+
+let option_to_stringvalue v =
+  match v with
+    None -> StringValue "None"
+  | Some s -> StringValue s
+
 let rec value_to_string v =
   match v with
     StringValue s -> s
Index: mldonkey/src/utils/lib/options.mli
diff -u mldonkey/src/utils/lib/options.mli:1.8 
mldonkey/src/utils/lib/options.mli:1.9
--- mldonkey/src/utils/lib/options.mli:1.8      Sat Apr 23 21:54:11 2005
+++ mldonkey/src/utils/lib/options.mli  Wed May 31 22:26:05 2006
@@ -151,6 +151,8 @@
 
 val value_to_string : option_value -> string
 val string_to_value : string -> option_value
+val option_to_stringvalue : string option -> option_value
+val stringvalue_to_option : option_value -> string option
 val value_to_int : option_value -> int
 val int_to_value : int -> option_value
 val value_to_int64 : option_value -> int64