[Mldonkey-commits] mldonkey distribChangeLog src/daemon/driver/dri...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/16 16:52:35

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverControlers.ml driverInteractive.ml 
                           driverInterface.ml 

Log message:
        patch #5186

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.890&r2=1.891
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverControlers.ml?cvsroot=mldonkey&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInterface.ml?cvsroot=mldonkey&r1=1.46&r2=1.47

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -b -r1.890 -r1.891
--- distrib/ChangeLog   15 Jun 2006 14:40:53 -0000      1.890
+++ distrib/ChangeLog   16 Jun 2006 16:52:35 -0000      1.891
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/06/16
+5186: GUI: Send only non-empty real_startup_message string
+
 2006/06/15
 5156: HTML, improve Options output (schlumpf)
 * new command html_mods_use_js_helptext (true|false)

Index: src/daemon/driver/driverControlers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/daemon/driver/driverControlers.ml       25 May 2006 19:52:10 -0000      
1.70
+++ src/daemon/driver/driverControlers.ml       16 Jun 2006 16:52:35 -0000      
1.71
@@ -603,7 +603,9 @@
         before_telnet_output o sock;
         TcpBufferedSocket.write_string sock
           (Printf.sprintf "Welcome to MLDonkey %s\n" Autoconf.current_version);
-        TcpBufferedSocket.write_string sock 
(DriverInteractive.real_startup_message ());
+       (match DriverInteractive.real_startup_message () with
+          Some s -> TcpBufferedSocket.write_string sock (s);
+        | None -> ());
 
         TcpBufferedSocket.write_string sock (dollar_escape o false
             "$cWelcome on mldonkey command-line$n\n\nUse $r?$n for help\n\n");
@@ -1156,9 +1158,10 @@
         | "oneframe.html" ->
             html_open_page buf t r true;
             Buffer.add_string buf !!motd_html;
-           Buffer.add_string buf "<p><pre><b><h3>";
-            Buffer.add_string buf (DriverInteractive.real_startup_message ());
-           Buffer.add_string buf "</b></h3>";
+           (match DriverInteractive.real_startup_message () with
+              Some s -> Buffer.add_string buf (Printf.sprintf 
"<p><pre><b><h3>%s</b></h3></pre>" s);
+            | None -> ());
+           Buffer.add_string buf "<pre>\n";
            ignore (buildinfo false buf);
            Buffer.add_string buf "\n";
            ignore (runinfo false buf o);

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/daemon/driver/driverInteractive.ml      11 Jun 2006 17:37:38 -0000      
1.82
+++ src/daemon/driver/driverInteractive.ml      16 Jun 2006 16:52:35 -0000      
1.83
@@ -80,8 +80,11 @@
 let dns_works = ref false
   
 let real_startup_message () =
+  let s =
   !startup_message ^ (verify_user_admin ()) ^ (check_supported_os ()) 
   ^ (if not !dns_works then "DNS resolution does not work" else "")
+  in
+  if s = "" then None else Some s
 
 let hdd_check () =
   let dir_full dir mb =

Index: src/daemon/driver/driverInterface.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- src/daemon/driver/driverInterface.ml        25 May 2006 20:03:10 -0000      
1.46
+++ src/daemon/driver/driverInterface.ml        16 Jun 2006 16:52:35 -0000      
1.47
@@ -392,8 +392,9 @@
   networks_iter_all (fun n ->
       gui_send gui (Network_info (network_info n)));
   gui_send gui (Console ((DriverControlers.text_of_html !!motd_html) ^ "\n"));
-  gui_send gui (Console (DriverInteractive.real_startup_message ()));
-  
+  (match DriverInteractive.real_startup_message () with
+    Some s -> gui_send gui (Console s);
+  | None -> ());
   
   if gui.gui_poll then begin