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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/03/14 18:57:26

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

Log message:
        patch #7501

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1523&r2=1.1524
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.239&r2=1.240

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1523
retrieving revision 1.1524
diff -u -b -r1.1523 -r1.1524
--- distrib/ChangeLog   13 Mar 2011 17:51:02 -0000      1.1523
+++ distrib/ChangeLog   14 Mar 2011 18:57:25 -0000      1.1524
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2011/03/14
+7501: Options: Disable Overnet by default and remove contact.dat from web_infos
+
 2011/03/13
 7456: Mail: Multiple mail addresses for admin (ygrek)
 7500: Diskinfo: Recognize BTRFS

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- src/daemon/common/commonOptions.ml  13 Mar 2011 17:51:02 -0000      1.239
+++ src/daemon/common/commonOptions.ml  14 Mar 2011 18:57:26 -0000      1.240
@@ -1054,8 +1054,6 @@
         "http://www.bluetack.co.uk/config/level1.gz";);
       ("server.met", 0,
         "http://www.gruk.org/server.met.gz";);
-      ("contact.dat", 168,
-        "http://download.overnet.org/contact.dat";);
       ("geoip.dat", 0,
         
"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz";);
       ("nodes.gzip", 0,
@@ -1667,7 +1665,7 @@
 let options_version = define_expert_option current_section ["options_version"]
   ~internal: true
   "(internal option)"
-    int_option 21
+    int_option 22
 
 let max_comments_per_file = define_expert_option current_section 
["max_comments_per_file"]
   "Maximum number of comments per file"
@@ -1767,14 +1765,13 @@
   match name with
   | "mldc" -> enable_directconnect =:= true
   | "mlgnut" -> enable_gnutella =:= true
-  | "mldonkey" -> enable_donkey =:= true; enable_overnet =:= true
+  | "mldonkey" -> enable_donkey =:= true;
   | "mlslsk" -> enable_soulseek =:= true
   | "mlbt" -> enable_bittorrent =:= true
   | "mlnap" -> enable_opennap =:= true
   | _ ->
 (* default *)
       enable_donkey =:= true;
-      enable_overnet =:= true;
       enable_bittorrent =:= true
 
 let win_message =
@@ -2268,4 +2265,9 @@
         
"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz";;
       update 21
 
+  | 21 ->
+      web_infos_remove "http://download.overnet.org/contact.dat";;
+      enable_overnet =:= false;
+      update 22
+
   | _ -> ()