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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/08 20:05:26

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonMessages.ml commonOptions.ml 
        src/networks/donkey: donkeyServers.ml 

Log message:
        patch #4961

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.763&tr2=1.764&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonMessages.ml.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml.diff?tr1=1.52&tr2=1.53&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.763 mldonkey/distrib/ChangeLog:1.764
--- mldonkey/distrib/ChangeLog:1.763    Wed Mar  8 18:49:42 2006
+++ mldonkey/distrib/ChangeLog  Wed Mar  8 20:05:26 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/03/08
+4961: EDK: New default URL for server list download
 4960: Ignore .DS_Store on MacOSX, BT: ignore dirs in torrents/incoming (pango)
 
 2006/03/06
Index: mldonkey/src/daemon/common/commonMessages.ml
diff -u mldonkey/src/daemon/common/commonMessages.ml:1.48 
mldonkey/src/daemon/common/commonMessages.ml:1.49
--- mldonkey/src/daemon/common/commonMessages.ml:1.48   Fri Feb  3 00:45:15 2006
+++ mldonkey/src/daemon/common/commonMessages.ml        Wed Mar  8 20:05:26 2006
@@ -590,7 +590,7 @@
 onclick=\"servers();\">Import Server.met</TD>
 <TD class=\"bu bbig\" title=\"Open Serverlist\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
-onClick=\"mSub('fstatus','bw_stats');top.output.location.href='http://www.gruk.org/list.php'\">Serverlist</TD>
+onClick=\"mSub('fstatus','bw_stats');top.output.location.href='http://www.jd2k.com/liste.php'\">Serverlist</TD>
 </TR></TBODY></TABLE></DIV>
 
 <DIV ID=\"tab4\" style=\"display: none\">
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.131 
mldonkey/src/daemon/common/commonOptions.ml:1.132
--- mldonkey/src/daemon/common/commonOptions.ml:1.131   Mon Mar  6 17:59:44 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Wed Mar  8 20:05:26 2006
@@ -841,7 +841,7 @@
     IMPORTANT: Put the URL and the kind between quotes.
     EXAMPLE:
  web_infos = [
-  (\"server.met\", 0, \"http://www.gruk.org/server.met.gz\";);
+  (\"server.met\", 0, \"http://www.jd2k.com/server.met\";);
   (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/antip2p.txt\";);
   (\"ocl\", 24, 
\"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\";);
   (\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\";);
@@ -853,7 +853,7 @@
     ("guarding.p2p", 96,
       "http://www.bluetack.co.uk/config/antip2p.txt";);
     ("server.met", 0,
-      "http://www.gruk.org/server.met.gz";);
+      "http://www.jd2k.com/server.met";);
     ("contact.dat", 168,
       "http://download.overnet.org/contact.dat";);
     ("geoip.dat", 0,
@@ -1473,7 +1473,7 @@
 
 let options_version = define_expert_option current_section ["options_version"]
     "(internal option)"
-    int_option 9
+    int_option 10
 
 
 (*************************************************************************)
@@ -1937,4 +1937,16 @@
         ];
       update 9
 
+  | 9 ->
+      web_infos_remove
+        [
+          ("server.met", 0,
+            "http://www.gruk.org/server.met.gz";);
+        ];
+      web_infos =:= !!web_infos @ [
+          ("server.met", 0,
+            "http://www.jd2k.com/server.met";);
+        ];
+      update 10
+
   | _ -> ()
Index: mldonkey/src/networks/donkey/donkeyServers.ml
diff -u mldonkey/src/networks/donkey/donkeyServers.ml:1.52 
mldonkey/src/networks/donkey/donkeyServers.ml:1.53
--- mldonkey/src/networks/donkey/donkeyServers.ml:1.52  Sun Feb  5 13:17:40 2006
+++ mldonkey/src/networks/donkey/donkeyServers.ml       Wed Mar  8 20:05:26 2006
@@ -544,7 +544,7 @@
                 lprintf_nl () "Please import servers from a server.met file.";
                 lprintf_nl () "Let MLDonkey use a file configured in 
web_infos";
                 lprintf_nl () "or enter this link into MLDonkey:";
-    lprintf_nl () "ed2k://|serverlist|http://www.gruk.org/server.met.gz|/"
+    lprintf_nl () "ed2k://|serverlist|http://www.jd2k.com/server.met|/"
               end;
 
               raise Not_found;