[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk/newgui/gui_f...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/21 10:45:51

Modified files:
        distrib        : ChangeLog 
        src/gtk/newgui : gui_friends.ml 

Log message:
        patch #5317

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.965&r2=1.966
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_friends.ml?cvsroot=mldonkey&r1=1.16&r2=1.17

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -b -r1.965 -r1.966
--- distrib/ChangeLog   16 Aug 2006 19:12:42 -0000      1.965
+++ distrib/ChangeLog   21 Aug 2006 10:45:50 -0000      1.966
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/08/21
+5317: Compile fix for GTK1 newgui in addition to patch 5310
+
 2006/08/16
 5309: Increase reserved number of FDs from 20 to 40 for dynamic libs
 5310: EDK: Request filelist from friends only when requested,

Index: src/gtk/newgui/gui_friends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_friends.ml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/gtk/newgui/gui_friends.ml       14 Dec 2005 21:22:07 -0000      1.16
+++ src/gtk/newgui/gui_friends.ml       21 Aug 2006 10:45:51 -0000      1.17
@@ -470,7 +470,7 @@
       }
     
     method update_friend f_new =
-      if client_browsed_tag land f_new.client_type = 0 then
+      if (client_friend_tag lor client_contact_tag) land f_new.client_type = 0 
then
         self#h_remove_friend f_new.client_num
       else
       try
@@ -527,7 +527,7 @@
     method update_friend_type (num, friend_kind) =
       try
         let (row, fi) = self#find_client num in
-        if client_browsed_tag land friend_kind = 0 then
+        if (client_friend_tag lor client_contact_tag) land friend_kind = 0 then
           self#h_remove_friend num
           else begin
             fi.gclient_type <- friend_kind;