[Mldonkey-commits] mldonkey distribChangeLog src/daemon/common/com...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/19 20:26:08

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

Log message:
        patch #5194

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.896&r2=1.897
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.84&r2=1.85

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -b -r1.896 -r1.897
--- distrib/ChangeLog   18 Jun 2006 20:24:21 -0000      1.896
+++ distrib/ChangeLog   19 Jun 2006 20:26:08 -0000      1.897
@@ -15,6 +15,9 @@
 =========
 
 2006/06/18
+5194: HTML: Print warning on opening page when enable_servers is set to false
+
+2006/06/18
 5191: HTML: remove sysinfo on opening page & option motd_html
 5192: Fix deactivation of verbosity "gui"
 5163: Configure: CVS SCM support for Mac OS X 10.3 (gstat)

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- src/daemon/common/commonOptions.ml  18 Jun 2006 20:24:21 -0000      1.154
+++ src/daemon/common/commonOptions.ml  19 Jun 2006 20:26:08 -0000      1.155
@@ -569,7 +569,7 @@
 
 let enable_servers = define_option current_section
     ["enable_servers"]
-  "Set to true if you also want mldonkey to run with edonkey servers
+  "Set to true if you want mldonkey to connect to edonkey servers
    (enable_donkey must be true, and only experimental)"
     bool_option true
 

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- src/daemon/driver/driverInteractive.ml      17 Jun 2006 12:51:19 -0000      
1.84
+++ src/daemon/driver/driverInteractive.ml      19 Jun 2006 20:26:08 -0000      
1.85
@@ -83,6 +83,9 @@
   let s =
   !startup_message ^ (verify_user_admin ()) ^ (check_supported_os ()) 
   ^ (if not !dns_works then "DNS resolution does not work" else "")
+  ^ (if Autoconf.donkey = "yes" && not !!enable_servers && !!enable_donkey then
+     "You disabled option enable_servers, you will not be able to connect to 
ED2K servers"
+     else "")
   in
   if s = "" then None else Some s