[Mldonkey-commits] mldonkey/src gtk/gui/gui_friends.ml gtk/gui/gui...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/28 12:58:11

Modified files:
        src/gtk/gui    : gui_friends.ml gui_misc.ml gui_window.ml 
        src/gtk/newgui : gui_downloads.ml gui_friends.ml gui_misc.ml 
                         gui_servers.ml gui_window.ml 
        src/gtk2/gui   : guiMisc.ml 

Log message:
        patch #5581

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_friends.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_misc.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_window.ml?cvsroot=mldonkey&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_downloads.ml?cvsroot=mldonkey&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_friends.ml?cvsroot=mldonkey&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_misc.ml?cvsroot=mldonkey&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_servers.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_window.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMisc.ml?cvsroot=mldonkey&r1=1.19&r2=1.20

Patches:
Index: gtk/gui/gui_friends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_friends.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtk/gui/gui_friends.ml      12 Jun 2006 10:02:58 -0000      1.6
+++ gtk/gui/gui_friends.ml      28 Nov 2006 12:58:10 -0000      1.7
@@ -41,6 +41,7 @@
   | Connected (-2) -> gettext M.connected, Some !!O.color_connected 
   | Connecting  -> gettext M.connecting, Some !!O.color_connecting
   | NewHost -> "NEW HOST", None
+  | ServerFull -> "server full", None
   | Connected_initiating -> gettext M.initiating, Some !!O.color_not_connected
   | Connected 0 -> gettext M.queued, Some !!O.color_connected
   | Connected n -> Printf.sprintf "Ranked %d" n, Some !!O.color_connected

Index: gtk/gui/gui_misc.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_misc.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtk/gui/gui_misc.ml 18 Oct 2005 20:52:08 -0000      1.6
+++ gtk/gui/gui_misc.ml 28 Nov 2006 12:58:10 -0000      1.7
@@ -55,6 +55,7 @@
   | Connected _ -> true
   | NotConnected _
   | Connecting
+  | ServerFull
   | RemovedHost
   | BlackListedHost
   | NewHost -> false

Index: gtk/gui/gui_window.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_window.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtk/gui/gui_window.ml       2 Feb 2004 10:34:08 -0000       1.3
+++ gtk/gui/gui_window.ml       28 Nov 2006 12:58:10 -0000      1.4
@@ -40,6 +40,7 @@
   | Connected _ -> true
   | NotConnected _
   | Connecting
+  | ServerFull
   | RemovedHost
   | BlackListedHost
   | NewHost-> false

Index: gtk/newgui/gui_downloads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_downloads.ml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtk/newgui/gui_downloads.ml 1 Sep 2006 16:22:14 -0000       1.17
+++ gtk/newgui/gui_downloads.ml 28 Nov 2006 12:58:11 -0000      1.18
@@ -183,6 +183,7 @@
     | Connecting  -> CConnecting
     | NewHost -> CNewHost
     | Connected_initiating -> CConnected_initiating
+    | ServerFull -> CNotConnected (BasicSocket.Closed_connect_failed,0)
     | NotConnected (p,n) -> CNotConnected (p,n)
     | RemovedHost -> CRemovedHost
     | BlackListedHost -> CBlackListedHost

Index: gtk/newgui/gui_friends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_friends.ml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtk/newgui/gui_friends.ml   31 Oct 2006 15:40:05 -0000      1.19
+++ gtk/newgui/gui_friends.ml   28 Nov 2006 12:58:11 -0000      1.20
@@ -47,6 +47,7 @@
   | Connected_initiating -> M.fT_tx_initiating, Some !!O.color_not_connected
   | Connected 0 -> M.fT_tx_queued, Some !!O.color_connected
   | Connected n -> Printf.sprintf Gui_messages.fT_tx_ranked n, Some 
!!O.color_connected
+  | ServerFull -> "", None
   | NotConnected (_,n) -> 
       if n = -1 then
         "", None
@@ -82,6 +83,7 @@
       | NewHost -> O.gdk_pix M.o_xpm_connect_n
       | Connected_initiating -> O.gdk_pix M.o_xpm_connect_m
       | Connected n -> O.gdk_pix M.o_xpm_connect_y
+      | ServerFull -> O.gdk_pix M.o_xpm_connect_n
       | NotConnected (_,n) -> O.gdk_pix M.o_xpm_connect_n
       | RemovedHost -> O.gdk_pix M.o_xpm_removedhost
       | BlackListedHost -> O.gdk_pix M.o_xpm_blacklistedhost

Index: gtk/newgui/gui_misc.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_misc.ml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtk/newgui/gui_misc.ml      25 Oct 2006 11:34:46 -0000      1.7
+++ gtk/newgui/gui_misc.ml      28 Nov 2006 12:58:11 -0000      1.8
@@ -60,6 +60,7 @@
   | NotConnected _
   | Connecting
   | RemovedHost
+  | ServerFull
   | BlackListedHost
   | NewHost -> false
 

Index: gtk/newgui/gui_servers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_servers.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtk/newgui/gui_servers.ml   20 Jul 2006 16:56:42 -0000      1.9
+++ gtk/newgui/gui_servers.ml   28 Nov 2006 12:58:11 -0000      1.10
@@ -121,6 +121,7 @@
       | Connected_initiating -> O.gdk_pix M.o_xpm_server_ci
       | Connected 0 -> O.gdk_pix M.o_xpm_server_c_low
       | Connected n -> O.gdk_pix M.o_xpm_server_c_low
+      | ServerFull -> O.gdk_pix M.o_xpm_server_nc
       | NotConnected (_,n) -> O.gdk_pix M.o_xpm_server_nc
       | RemovedHost -> O.gdk_pix M.o_xpm_removedhost
       | BlackListedHost -> O.gdk_pix M.o_xpm_blacklistedhost

Index: gtk/newgui/gui_window.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_window.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtk/newgui/gui_window.ml    29 Jul 2004 10:25:33 -0000      1.6
+++ gtk/newgui/gui_window.ml    28 Nov 2006 12:58:11 -0000      1.7
@@ -40,6 +40,7 @@
   | Connected_downloading _
   | Connected _ -> true
   | NotConnected _
+  | ServerFull
   | Connecting
   | RemovedHost
   | BlackListedHost

Index: gtk2/gui/guiMisc.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMisc.ml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtk2/gui/guiMisc.ml 16 Aug 2006 19:10:34 -0000      1.19
+++ gtk2/gui/guiMisc.ml 28 Nov 2006 12:58:11 -0000      1.20
@@ -470,6 +470,7 @@
   | Connected_initiating -> !M.dT_tx_initiating
   | Connected 0 -> !M.dT_tx_queued
   | Connected n -> U.simple_utf8_of (Printf.sprintf !M.dT_tx_ranked n)
+  | ServerFull -> ""
   | NotConnected (_,n) ->
       if n = -1 then
         ""
@@ -494,6 +495,7 @@
   | Connecting
   | RemovedHost
   | BlackListedHost
+  | ServerFull
   | NewHost -> false
 
 (*************************************************************************)
@@ -518,6 +520,7 @@
         | Connected_initiating -> !M.dT_tx_initiating
         | Connected 0 -> !M.dT_tx_queued
         | Connected n -> U.simple_utf8_of (Printf.sprintf !M.dT_tx_ranked n)
+        | ServerFull -> ""
         | NotConnected (_,n) ->
             if n = -1
               then ""
@@ -613,6 +616,7 @@
           | Connecting  -> M.icon_state_server_init
           | NotConnected _ -> M.icon_state_server_notcon
           | NewHost
+          | ServerFull
           | Connected_downloading _
           | RemovedHost
           | BlackListedHost -> M.icon_state_server_unknown