Re: patch for recent checkin ...

[ERDI Gergo <cactus cactus rulez org>]

On Mon, 30 Jul 2001, Michael Meeks wrote:

> 	Did you send a patch for your latest libbonobo / GClosure /
> marshaler re-org checkin ?

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.79
diff -u -u -r1.79 ChangeLog
--- ChangeLog	2001/07/30 21:00:17	1.79
+++ ChangeLog	2001/07/30 23:49:55
@@ -1,3 +1,8 @@
+2001-07-30  ERDI Gergo  <cactus cactus rulez org>
+
+	* bonobo/Makefile.am: Create our own marshallers instead of
+	relying on libbonobo
+
 2001-07-30  Mikael Hallendal  <micke codefactory se>
 
 	* tests/test-selector.c: include libgnome/libgnome.h instead
Index: bonobo/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/Makefile.am,v
retrieving revision 1.179
diff -u -u -r1.179 Makefile.am
--- bonobo/Makefile.am	2001/07/22 23:23:43	1.179
+++ bonobo/Makefile.am	2001/07/30 23:49:55
@@ -66,7 +66,8 @@
 	bonobo-window.h				\
 	bonobo-wrapper.h			\
 	bonobo-zoomable-frame.h			\
-	bonobo-zoomable.h
+	bonobo-zoomable.h			\
+	bonoboui-marshal.h
 
 libbonoboui_2_la_LIBADD = \
 	$(LIBGNOMECANVAS_LIBS) $(LIBBONOBO_LIBS) \
@@ -115,9 +116,26 @@
 	bonobo-window.c				\
 	bonobo-wrapper.c			\
 	bonobo-zoomable.c			\
-	bonobo-zoomable-frame.c
+	bonobo-zoomable-frame.c			\
+	bonoboui-marshal-main.c
 
+BUILT_SOURCES = \
+	bonoboui-marshal.c		\
+	bonoboui-marshal.h
+
+bonoboui-marshal.h: bonoboui-marshal.list
+	cd $(srcdir) \
+	&& glib-genmarshal --prefix=bonobo_ui_marshal bonoboui-marshal.list --header >> xgen-gmh \
+	&& (cmp -s xgen-gmh bonoboui-marshal.h || cp xgen-gmh bonoboui-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+bonoboui-marshal.c: bonoboui-marshal.list bonoboui-marshal.h
+	cd $(srcdir) \
+	&& glib-genmarshal --prefix=bonobo_ui_marshal bonoboui-marshal.list --body >> xgen-gmc \
+	&& cp xgen-gmc bonoboui-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libbonoboui-2.0.pc
 
-EXTRA_DIST = bonobo-insert-component.xpm libbonoboui-2.0.pc.in
+EXTRA_DIST = bonobo-insert-component.xpm libbonoboui-2.0.pc.in bonoboui-marshal.list
Index: bonobo/bonobo-ui-component.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-component.c,v
retrieving revision 1.54
diff -u -u -r1.54 bonobo-ui-component.c
--- bonobo/bonobo-ui-component.c	2001/07/30 20:36:45	1.54
+++ bonobo/bonobo-ui-component.c	2001/07/30 23:49:56
@@ -15,7 +15,8 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-marshal.h>
+#include <bonobo/bonoboui-marshal.h>
+#include <bonobo/bonobo-types.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
@@ -225,12 +226,8 @@
 
 	verb = g_new (UIVerb, 1);
 	verb->cname      = g_strdup (cname);
-	verb->closure    = closure;
-
-	if (G_CLOSURE_NEEDS_MARSHAL (closure))
-		g_closure_set_marshal (
-			closure,
-			marshal_VOID__USER_DATA_STRING);
+	verb->closure    = bonobo_closure_store
+		(closure, marshal_VOID__USER_DATA_STRING);
 	
 	/*	verb->cb (component, verb->user_data, cname); */
 
@@ -356,11 +353,8 @@
 
 	list = g_new (UIListener, 1);
 	list->id = g_strdup (id);
-	list->closure = closure;
-
-	if (G_CLOSURE_NEEDS_MARSHAL (closure))
-		g_closure_set_marshal (
-			closure, bonobo_marshal_VOID__STRING_ENUM_STRING);
+	list->closure = bonobo_closure_store
+		(closure, bonobo_ui_marshal_VOID__STRING_ENUM_STRING);
 
 	g_hash_table_insert (priv->listeners, list->id, list);	
 }
@@ -1418,7 +1412,7 @@
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (BonoboUIComponentClass, ui_event),
 		NULL, NULL,
-		bonobo_marshal_VOID__STRING_INT_STRING,
+		bonobo_ui_marshal_VOID__STRING_INT_STRING,
 		G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT,
 		G_TYPE_STRING);
 
Index: bonobo/bonoboui-marshal-main.c
===================================================================
RCS file: bonoboui-marshal-main.c
diff -N bonoboui-marshal-main.c
--- /dev/null	Tue May  5 16:32:27 1998
+++ bonoboui-marshal-main.c	Mon Jul 30 19:49:56 2001
@@ -0,0 +1,8 @@
+#include <gobject/gobject.h>
+
+#include <gobject/genums.h>
+#include <gobject/gvaluetypes.h>
+#include <gobject/gboxed.h>
+
+#include <bonobo/bonoboui-marshal.h>
+#include "bonoboui-marshal.c"
Index: bonobo/bonoboui-marshal.list
===================================================================
RCS file: bonoboui-marshal.list
diff -N bonoboui-marshal.list
--- /dev/null	Tue May  5 16:32:27 1998
+++ bonoboui-marshal.list	Mon Jul 30 19:49:56 2001
@@ -0,0 +1,2 @@
+VOID:STRING,ENUM,STRING
+VOID:STRING,INT,STRING
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/po/ChangeLog,v
retrieving revision 1.12
diff -u -u -r1.12 ChangeLog
--- po/ChangeLog	2001/07/18 22:34:03	1.12
+++ po/ChangeLog	2001/07/30 23:49:57
@@ -1,3 +1,33 @@
+2001-07-30  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-30  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-29  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-28  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-26  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-26  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-26  gettextize  <bug-gnu-utils gnu org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+	* cat-id-tbl.c: Remove file.
+	* stamp-cat-id: Remove file.
+
 2001-07-19  Anders Carlsson  <andersca gnome org>
 
 	* POTFILES.in: Changed test_selector.c to selector-test.c

-- 
   .--= ULLA! =---------------------.   `We are not here to give users what
   \     http://cactus.rulez.org     \   they want'  -- RMS, at GUADEC 2001
    `---= cactus cactus rulez org =---'
Save the whales. Collect the whole set.