From 6e8815b08af88622cd5add61a7088fc45ab73f37 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 12 May 2009 15:35:28 -0500
Subject: Getting the proper marshaller for the change in API

---
 .bzrignore                             |  3 +++
 libdbusmenu-glib/Makefile.am           | 18 +++++++++++++++++-
 libdbusmenu-glib/menuitem-marshal.list |  1 +
 libdbusmenu-glib/menuitem.c            |  3 ++-
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 libdbusmenu-glib/menuitem-marshal.list

diff --git a/.bzrignore b/.bzrignore
index 36595be..543c073 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -28,3 +28,6 @@ libdbusmenu_glib_la-server-marshal.lo
 glib-server-nomenu
 test-glib-layout-server
 test-glib-layout-client
+menuitem-marshal.c
+menuitem-marshal.h
+libdbusmenu_glib_la-menuitem-marshal.lo
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index b273555..844e1b8 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -1,7 +1,9 @@
 
 EXTRA_DIST = \
 	dbusmenu-glib.pc.in \
-	dbus-menu.xml
+	dbus-menu.xml \
+	menuitem-marshal.list \
+	server-marshal.list
 
 lib_LTLIBRARIES = \
 	libdbusmenu-glib.la
@@ -18,6 +20,8 @@ libdbusmenu_glib_la_SOURCES = \
 	dbusmenu-client.h \
 	menuitem.h \
 	menuitem.c \
+	menuitem-marshal.h \
+	menuitem-marshal.c \
 	server.h \
 	server.c \
 	server-marshal.h \
@@ -42,6 +46,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 BUILT_SOURCES = \
 	dbusmenu-client.h \
 	dbusmenu-server.h \
+	menuitem-marshal.h \
+	menuitem-marshal.c \
 	server-marshal.h \
 	server-marshal.c
 
@@ -69,3 +75,13 @@ server-marshal.c: $(srcdir)/server-marshal.list
 		--prefix=_dbusmenu_server_marshal $(srcdir)/server-marshal.list \
 		> server-marshal.c
 
+menuitem-marshal.h: $(srcdir)/menuitem-marshal.list
+	glib-genmarshal --header \
+		--prefix=_dbusmenu_menuitem_marshal $(srcdir)/menuitem-marshal.list \
+		> menuitem-marshal.h
+
+menuitem-marshal.c: $(srcdir)/menuitem-marshal.list
+	glib-genmarshal --body \
+		--prefix=_dbusmenu_menuitem_marshal $(srcdir)/menuitem-marshal.list \
+		> menuitem-marshal.c
+
diff --git a/libdbusmenu-glib/menuitem-marshal.list b/libdbusmenu-glib/menuitem-marshal.list
new file mode 100644
index 0000000..8962c1b
--- /dev/null
+++ b/libdbusmenu-glib/menuitem-marshal.list
@@ -0,0 +1 @@
+VOID: STRING, STRING
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 4ee88c7..99cae09 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -30,6 +30,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "config.h"
 #endif
 #include "menuitem.h"
+#include "menuitem-marshal.h"
 
 /* Private */
 /**
@@ -105,7 +106,7 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                         G_SIGNAL_RUN_LAST,
 	                                         G_STRUCT_OFFSET(DbusmenuMenuitemClass, property_changed),
 	                                         NULL, NULL,
-	                                         g_cclosure_marshal_VOID__STRING_STRING,
+	                                         _dbusmenu_menuitem_marshal_VOID__STRING_STRING,
 	                                         G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
 	g_object_class_install_property (object_class, PROP_ID,
-- 
cgit v1.2.3