ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/cape-girardeau/dbus-interfaces into lp:~ted/cape-girardeau/trunk.

    Requested reviews:
    Cape Girardeau Team (cape-girardeau-team)

-- 
https://code.launchpad.net/~ted/cape-girardeau/dbus-interfaces/+merge/13453
Your team ayatana-commits is subscribed to branch lp:~ted/cape-girardeau/trunk.

=== modified file '.bzrignore'
--- .bzrignore	2009-10-13 20:37:08 +0000
+++ .bzrignore	2009-10-16 01:50:21 +0000
@@ -5,3 +5,7 @@
 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

=== modified file 'Makefile.am'
--- Makefile.am	2009-10-13 19:39:46 +0000
+++ Makefile.am	2009-10-16 01:50:21 +0000
@@ -2,3 +2,17 @@
           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

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-10-13 20:37:08 +0000
+++ src/Makefile.am	2009-10-16 01:50:21 +0000
@@ -1,6 +1,4 @@
 
-libexec_PROGRAMS = indicator-custom-service
-
 ##################################
 # Indicator
 ##################################
@@ -22,10 +20,44 @@
 # 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=_$(subst -,_,$(<:.xml=))_client \
+		--mode=glib-client \
+		--output=$@ \
+		$<
+
+%-server.h: %.xml
+	dbus-binding-tool \
+		--prefix=_$(subst -,_,$(<:.xml=))_server \
+		--mode=glib-server \
+		--output=$@ \
+		$<
+
+BUILT_SOURCES = \
+	$(DBUS_SPECS:.xml=-client.h) \
+	$(DBUS_SPECS:.xml=-server.h)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = $(DBUS_SPECS)

=== modified file 'src/custom-service.c'
--- src/custom-service.c	2009-10-13 20:37:08 +0000
+++ src/custom-service.c	2009-10-16 01:50:21 +0000
@@ -1,4 +1,13 @@
-
+#include "notification-item-client.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)
 {

=== added file 'src/notification-item.xml'
--- src/notification-item.xml	1970-01-01 00:00:00 +0000
+++ src/notification-item.xml	2009-10-16 01:50:21 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+	<interface name="org.ayatana.indicator.custom.NotificationItem">
+
+<!-- Properties -->
+		<property name="Id" type="s" access="read" />
+		<property name="Category" type="s" access="read" />
+		<property name="Status" type="s" access="read" />
+		<property name="IconName" type="s" access="read" />
+		<property name="AttentionIconName" type="s" access="read" />
+		<property name="Menu" type="o" access="read" />
+
+<!-- Methods -->
+		<!-- None currently -->
+
+<!-- Signals -->
+		<signal name="NewIcon">
+		</signal>
+		<signal name="NewAttentionIcon">
+		</signal>
+		<signal name="NewStatus">
+			<arg type="s" name="status" direction="out" />
+		</signal>
+
+	</interface>
+</node>

=== added file 'src/notification-watcher.xml'
--- src/notification-watcher.xml	1970-01-01 00:00:00 +0000
+++ src/notification-watcher.xml	2009-10-16 01:50:21 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+	<interface name="org.ayatana.indicator.custom.NotificationWatcher">
+
+<!-- Properties -->
+		<!-- None currently -->
+
+<!-- Methods -->
+		<method name="RegisterService">
+			<arg type="s" name="service" direction="in" />
+		</method>
+		<method name="RegisteredServices">
+			<arg type="as" name="services" direction="out" />
+		</method>
+		<method name="ProtocolVersion">
+			<arg type="s" name="version" direction="out" />
+		</method>
+		<method name="RegisterNotificationHost">
+			<arg type="s" name="service" direction="in" />
+		</method>
+		<method name="IsNotificationHostRegistered">
+			<arg type="b" name="hasHost" direction="out" />
+		</method>
+
+<!-- Signals -->
+		<signal name="ServiceRegistered">
+			<arg type="s" name="service" direction="out" />
+		</signal>
+		<signal name="ServiceUnregistered">
+			<arg type="s" name="service" direction="out" />
+		</signal>
+		<signal name="NotificationHostRegistered">
+		</signal>
+		<signal name="NotificationHostUnegistered">
+		</signal>
+
+	</interface>
+</node>