From 9fc5dd8c5047e7d04872d223c5ec0124e3aa8946 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 17:16:43 -0500 Subject: Some dbus y'all! --- src/notification-item.xml | 26 ++++++++++++++++++++++++++ src/notification-watcher.xml | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 src/notification-item.xml create mode 100644 src/notification-watcher.xml diff --git a/src/notification-item.xml b/src/notification-item.xml new file mode 100644 index 0000000..f3a4792 --- /dev/null +++ b/src/notification-item.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml new file mode 100644 index 0000000..93acf74 --- /dev/null +++ b/src/notification-watcher.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 7b2c29fbd83d2679a123a8825c92b3ac97e79229 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:16:49 -0500 Subject: Getting to building all these header files nicely. --- src/Makefile.am | 36 +++++++++++++++++++++++++++++++++--- src/custom-service.c | 2 ++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 63f0c64..ae83eb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,4 @@ -libexec_PROGRAMS = indicator-custom-service - ################################## # Indicator ################################## @@ -22,10 +20,42 @@ libcustom_la_LDFLAGS = -module -avoid-version # Service ################################## +libexec_PROGRAMS = indicator-custom-service + indicator_custom_service_SOURCES = \ - custom-service.c + custom-service.c \ + notification-item-client.h \ + notification-watcher-server.h indicator_custom_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ -Wall -Werror indicator_custom_service_LDADD = \ $(INDICATOR_LIBS) + +################################## +# DBus Specs +################################## + +DBUS_SPECS = \ + notification-item.xml \ + notification-watcher.xml + +%-client.h: %.xml + dbus-binding-tool \ + --prefix=_$(<:.xml=)_client \ + --mode=glib-client \ + --output=$@ \ + $< + +%-server.h: %.xml + dbus-binding-tool \ + --prefix=_$(<:.xml=)_server \ + --mode=glib-server \ + --output=$@ \ + $< + +BUILT_SOURCES = \ + $(DBUS_SPECS:.xml=-client.h) \ + $(DBUS_SPECS:.xml=-server.h) + +DIST_CLEAN = $(BUILT_SOURCES) diff --git a/src/custom-service.c b/src/custom-service.c index 63590c7..5a5fc62 100644 --- a/src/custom-service.c +++ b/src/custom-service.c @@ -1,3 +1,5 @@ +#include "notification-item-client.h" +#include "notification-watcher-server.h" int main (int argc, char ** argv) -- cgit v1.2.3 From 17192c26de5cc0662c218196ef4b53ebaf1eef0b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:19:39 -0500 Subject: Fixing symbol names. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ae83eb3..23235c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,14 +42,14 @@ DBUS_SPECS = \ %-client.h: %.xml dbus-binding-tool \ - --prefix=_$(<:.xml=)_client \ + --prefix=_$(subst -,_,$(<:.xml=))_client \ --mode=glib-client \ --output=$@ \ $< %-server.h: %.xml dbus-binding-tool \ - --prefix=_$(<:.xml=)_server \ + --prefix=_$(subst -,_,$(<:.xml=))_server \ --mode=glib-server \ --output=$@ \ $< -- cgit v1.2.3 From 89ebfc6d19ec1acc39e5eb271955b6c50cdbbe35 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:22:38 -0500 Subject: Getting some functions so that we can link happy like. --- src/custom-service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/custom-service.c b/src/custom-service.c index 5a5fc62..d96a9de 100644 --- a/src/custom-service.c +++ b/src/custom-service.c @@ -1,6 +1,13 @@ #include "notification-item-client.h" -#include "notification-watcher-server.h" +void _notification_watcher_server_register_service (void) { }; +void _notification_watcher_server_registered_services (void) { }; +void _notification_watcher_server_protocol_version (void) { }; +void _notification_watcher_server_register_notification_host (void) { }; +void _notification_watcher_server_is_notification_host_registered (void) { }; + +#include "notification-watcher-server.h" + int main (int argc, char ** argv) { -- cgit v1.2.3 From df1cc80c7f1ac98fd298631c7555663dd144df73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:26:35 -0500 Subject: Making sure we get our specs and clean up after ourselves. Distcheck magic. --- src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 23235c5..2139b62 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,4 +58,6 @@ BUILT_SOURCES = \ $(DBUS_SPECS:.xml=-client.h) \ $(DBUS_SPECS:.xml=-server.h) -DIST_CLEAN = $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) + +EXTRA_DIST = $(DBUS_SPECS) -- cgit v1.2.3 From d6fb194d49ea59b14b673fa4460a40207113a718 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Oct 2009 14:45:07 -0500 Subject: Building the ChangeLog on dist --- Makefile.am | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index 1d1ff09..fb738a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,3 +2,17 @@ SUBDIRS = data \ src DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall + +dist-hook: + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ + fi -- cgit v1.2.3 From afd1d1747e91db94c370ea4a3400906fe4227e09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Oct 2009 14:49:04 -0500 Subject: Ignoring the generated dbus interfaces. --- .bzrignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.bzrignore b/.bzrignore index a33f7f0..5d5b9c7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -5,3 +5,7 @@ m4/ src/indicator-custom-service src/libcustom.la src/libcustom_la-indicator-custom.lo +src/notification-item-client.h +src/notification-item-server.h +src/notification-watcher-client.h +src/notification-watcher-server.h -- cgit v1.2.3