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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/07/18 14:52:42

Modified files:
        distrib        : ChangeLog 
        src/gtk2/gui   : guiTemplates.mli guiTools.mli 

Log message:
        patch #7252

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1447&r2=1.1448
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiTemplates.mli?cvsroot=mldonkey&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiTools.mli?cvsroot=mldonkey&r1=1.2&r2=1.3

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1447
retrieving revision 1.1448
diff -u -b -r1.1447 -r1.1448
--- distrib/ChangeLog   18 Jul 2010 14:49:59 -0000      1.1447
+++ distrib/ChangeLog   18 Jul 2010 14:52:42 -0000      1.1448
@@ -15,6 +15,7 @@
 =========
 
 2010/07/18
+7252: GTK2 GUI: Fix compile bug with lablgtk2-20100620 and Ocaml 3.12
 7251: BT: OCaml 3.08.3 compatibility fix (ygrek)
 7250: DC: discover self IP (ygrek)
 7249: DC: fix parsing MyINFO with non-latin nicks (ygrek)

Index: src/gtk2/gui/guiTemplates.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiTemplates.mli,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/gtk2/gui/guiTemplates.mli       12 Nov 2005 11:16:36 -0000      1.3
+++ src/gtk2/gui/guiTemplates.mli       18 Jul 2010 14:52:42 -0000      1.4
@@ -125,9 +125,10 @@
           method update_item : Gtk.tree_iter -> V.item -> V.item -> unit
         end
 
-      class treeview : [> Gtk.box] Gtk.obj ->
+      class treeview : ([> Gtk.box] as 'a) Gtk.obj ->
         object
           inherit GPack.box
+          val obj : 'a Gtk.obj
           method expanded_paths : int array list
           method gview : g_view
           method id : int

Index: src/gtk2/gui/guiTools.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiTools.mli,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/gtk2/gui/guiTools.mli   2 May 2005 12:57:59 -0000       1.2
+++ src/gtk2/gui/guiTools.mli   18 Jul 2010 14:52:42 -0000      1.3
@@ -174,6 +174,7 @@
 class tool_bar : ([> Gtk.box] as 'a) Gtk.obj ->
   object
     inherit GPack.box
+    val obj : 'a Gtk.obj
     val mutable bb_children : b_children list
     method add_toggle_button : 
       style : Gtk.Tags.toolbar_style ->