From 6e8815b08af88622cd5add61a7088fc45ab73f37 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 May 2009 15:35:28 -0500 Subject: Getting the proper marshaller for the change in API --- libdbusmenu-glib/Makefile.am | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'libdbusmenu-glib/Makefile.am') 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 + -- cgit v1.2.3 From b5312e7a0591a734a463d3eb50ff565605f210bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 May 2009 14:12:51 -0500 Subject: Adding in a function to get the properties, and make sure to catch soem more warnings and other protections. Also, no more deprecated GTK stuf. --- libdbusmenu-glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib/Makefile.am') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 844e1b8..a485f2b 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -35,7 +35,7 @@ libdbusmenu_glib_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_glib_la_CFLAGS = \ - $(DBUSMENUGLIB_CFLAGS) -Wall -Werror + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror -DG_DISABLE_DEPRECATED libdbusmenu_glib_la_LIBADD = \ $(DBUSMENUGLIB_LIBS) -- cgit v1.2.3 From 7f9e260da74ab97ecc279f079efd465c66802de4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 May 2009 15:27:40 -0500 Subject: Adding a log domain, this fixes an issue with getting the error quark in the server dbus interface. --- libdbusmenu-glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib/Makefile.am') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index a485f2b..e74b9ab 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -35,7 +35,7 @@ libdbusmenu_glib_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_glib_la_CFLAGS = \ - $(DBUSMENUGLIB_CFLAGS) -Wall -Werror -DG_DISABLE_DEPRECATED + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\"" libdbusmenu_glib_la_LIBADD = \ $(DBUSMENUGLIB_LIBS) -- cgit v1.2.3