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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/08/03 22:30:19

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

Log message:
        patch #6128

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1310&r2=1.1311
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.212&r2=1.213

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1310
retrieving revision 1.1311
diff -u -b -r1.1310 -r1.1311
--- distrib/ChangeLog   3 Aug 2007 22:14:18 -0000       1.1310
+++ distrib/ChangeLog   3 Aug 2007 22:30:19 -0000       1.1311
@@ -15,6 +15,7 @@
 =========
 
 2007/08/04
+6128: New default for option messages_filter (unease)
 6132: HTML: Fix group display in vd <num> for admin users
       view of other users files
 6130: Change API for network_parse_url, support user group

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -b -r1.212 -r1.213
--- src/daemon/common/commonOptions.ml  25 Jul 2007 19:27:09 -0000      1.212
+++ src/daemon/common/commonOptions.ml  3 Aug 2007 22:30:19 -0000       1.213
@@ -1363,7 +1363,7 @@
 
 let messages_filter = define_option current_section ["messages_filter"]
   "Regexp of messages to filter out, example: string1|string2|string3"
-    string_option "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED MESSAGE"
+    string_option "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED MESSAGE|Hi 
Honey!|Do you live in my area|download HyperMule"
 
 let comments_filter = define_option current_section ["comments_filter"]
   "Regexp of comments to filter out, example: string1|string2|string3"
@@ -1598,7 +1598,7 @@
 let options_version = define_expert_option current_section ["options_version"]
   ~internal: true
   "(internal option)"
-    int_option 18
+    int_option 19
 
 let max_comments_per_file = define_expert_option current_section 
["max_comments_per_file"]
   "Maximum number of comments per file"
@@ -2170,4 +2170,9 @@
       web_infos_add "hublist" 0 "http://dchublist.com/hublist.config.bz2";;
       update 18
 
+  | 18 ->
+      if !!messages_filter = "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED 
MESSAGE" then
+        messages_filter =:= "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED 
MESSAGE|Hi Honey!|Do you live in my area|download HyperMule";
+      update 19
+
   | _ -> ()