[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/12 14:04:02

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyServers.ml 

Log message:
        patch #5545

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1084&r2=1.1085
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.61&r2=1.62

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1084
retrieving revision 1.1085
diff -u -b -r1.1084 -r1.1085
--- distrib/ChangeLog   12 Nov 2006 12:44:24 -0000      1.1084
+++ distrib/ChangeLog   12 Nov 2006 14:04:02 -0000      1.1085
@@ -15,6 +15,7 @@
 =========
 
 2006/11/12
+5545: EDK: Do not show empty server message lines in GUI
 5509: Common: Merge file_print functions,
       BT: print BT-specific source infos in Telnet (thx to jave)
 5544: Clean up code to avoid otags warnings (pango)

Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/networks/donkey/donkeyServers.ml        9 Oct 2006 16:17:19 -0000       
1.61
+++ src/networks/donkey/donkeyServers.ml        12 Nov 2006 14:04:02 -0000      
1.62
@@ -301,6 +301,7 @@
         end
 
   | M.MessageReq msg ->
+      if msg <> "" then begin
       if !last_message_sender <> server_num s then begin
           let server_header = Printf.sprintf "\n+-- From server %s [%s] ------"
               s.server_name (string_of_server s) in
@@ -312,8 +313,8 @@
       s.server_banner <- s.server_banner ^ Printf.sprintf "%s\n" msg;
       let msg = Printf.sprintf "| %s" msg in
       CommonEvent.add_event (Console_message_event (Printf.sprintf "%s\n" 
msg));
-      if !CommonOptions.verbose_msg_servers then
-        lprintf_nl "%s" msg
+      if !CommonOptions.verbose_msg_servers then lprintf_nl "%s" msg
+      end
 
   | M.ServerListReq l ->
       if !!update_server_list_server then begin