[Mldonkey-commits] mldonkey distrib/ChangeLog src/gtk2/gui/configW...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/09/30 11:02:13

Modified files:
        distrib        : ChangeLog 
        src/gtk2/gui   : configWindow.ml guiFriends.ml guiQueries.ml 
                         gui_installer.ml 

Log message:
        patch #6220

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1321&r2=1.1322
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/configWindow.ml?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiFriends.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiQueries.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/gui_installer.ml?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -b -r1.1321 -r1.1322
--- distrib/ChangeLog   12 Sep 2007 22:44:37 -0000      1.1321
+++ distrib/ChangeLog   30 Sep 2007 11:02:12 -0000      1.1322
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2007/09/30
+6220: GTK2 GUI: Fix compile bug due to changed API in lablgtk-2.10.0
+- GTK2 GUI still compiles with older versions of lablgtk2
+
 2007/09/13
 6197: Options backup: Better log messages, remove useless exception
 -------------------------------------------------------------------------------

Index: src/gtk2/gui/configWindow.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/configWindow.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/gtk2/gui/configWindow.ml        19 Nov 2005 17:19:45 -0000      1.2
+++ src/gtk2/gui/configWindow.ml        30 Sep 2007 11:02:12 -0000      1.3
@@ -918,9 +918,9 @@
         begin
           let w = add_groups h_label groups in
           let markup = subsection_to_label sub in
-          notebook#append_page 
+          ignore (notebook#append_page 
             ~tab_label:((GMisc.label ~use_underline:true ~markup ())#coerce)
-            w;
+            w);
           iter notebook h_label tail
         end
 
@@ -1294,9 +1294,9 @@
          ~row_spacings:6 ~col_spacings:6 ~border_width:6
          ~packing:scrolled_box#add_with_viewport ()
     in
-    notebook#append_page 
+    ignore (notebook#append_page 
       ~tab_label:((GMisc.label ~use_underline:true ~markup ())#coerce)
-      scrolled_box#coerce;
+      scrolled_box#coerce);
     List.iter (fun p->
       add_pref ~table ~p ~top:!top ~advanced_mode ();
       incr top

Index: src/gtk2/gui/guiFriends.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiFriends.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiFriends.ml  16 Aug 2006 19:12:08 -0000      1.4
+++ src/gtk2/gui/guiFriends.ml  30 Sep 2007 11:02:12 -0000      1.5
@@ -520,7 +520,7 @@
        true
       )
   ));
-  notebook#append_page ~tab_label:hbox#coerce main_evbox#coerce
+  ignore (notebook#append_page ~tab_label:hbox#coerce main_evbox#coerce)
 
 (*************************************************************************)
 (*                                                                       *)

Index: src/gtk2/gui/guiQueries.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiQueries.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/gtk2/gui/guiQueries.ml  15 Jul 2006 11:46:57 -0000      1.4
+++ src/gtk2/gui/guiQueries.ml  30 Sep 2007 11:02:13 -0000      1.5
@@ -362,7 +362,7 @@
        true
       )
   ));
-  notebook#append_page ~tab_label:hbox#coerce main_evbox#coerce
+  ignore (notebook#append_page ~tab_label:hbox#coerce main_evbox#coerce)
 
 (*************************************************************************)
 (*                                                                       *)

Index: src/gtk2/gui/gui_installer.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/gui_installer.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/gtk2/gui/gui_installer.ml       1 Jul 2007 13:00:11 -0000       1.3
+++ src/gtk2/gui/gui_installer.ml       30 Sep 2007 11:02:13 -0000      1.4
@@ -127,7 +127,7 @@
     method vbox = main_vbox
     
     initializer
-      notebook#append_page  ~tab_label: tab_label#coerce vbox#coerce ;
+      (ignore notebook#append_page  ~tab_label: tab_label#coerce vbox#coerce);
       ignore (next_slide#connect#clicked
           (fun () ->  notebook#next_page ()));
       ignore (previous_slide#connect#clicked