From 421cea272535812a6fcc4d64811d6bf6a5362647 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 15 Jan 2009 17:10:14 -0600
Subject: Changing to the dbus interface and changing to build teh client and
 server interfaces

---
 libindicate/Makefile.am            | 17 ++++++++---
 libindicate/indicate-interface.xml | 60 ++++++++++++++++++++++++++++++++++++++
 libindicate/indicate-server.xml    | 60 --------------------------------------
 3 files changed, 73 insertions(+), 64 deletions(-)
 create mode 100644 libindicate/indicate-interface.xml
 delete mode 100644 libindicate/indicate-server.xml

diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index 2d75dbd..b3c173a 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -5,10 +5,11 @@ INCLUDES= \
 	-DG_LOG_DOMAIN=\"libindicate\"
 
 EXTRA_DIST = \
-	indicate-server.xml
+	indicate-interface.xml
 
 BUILT_SOURCES = \
-	dbus-indicate-server.h
+	dbus-indicate-server.h \
+	dbus-indicate-client.h
 
 lib_LTLIBRARIES = \
 	libindicate.la
@@ -26,6 +27,7 @@ libindicateinclude_HEADERS = \
 libindicate_la_SOURCES = \
 	$(indicate_headers) \
 	dbus-indicate-server.h \
+	dbus-indicate-client.h \
 	server.c \
 	listener.c \
 	indicator.c
@@ -41,12 +43,19 @@ libindicate_la_CFLAGS = \
 libindicate_la_LIBADD = \
 	$(LIBINDICATE_LIBS)
 
-dbus-indicate-server.h: indicate-server.xml
+dbus-indicate-server.h: indicate-interface.xml
 	libtool --mode=execute dbus-binding-tool \
 		--prefix=indicate_server \
 		--mode=glib-server \
 		--output=dbus-indicate-server.h \
-		$(srcdir)/indicate-server.xml
+		$(srcdir)/indicate-interface.xml
+
+dbus-indicate-client.h: indicate-interface.xml
+	libtool --mode=execute dbus-binding-tool \
+		--prefix=indicate_client \
+		--mode=glib-client \
+		--output=dbus-indicate-client.h \
+		$(srcdir)/indicate-interface.xml
 
 pkgconfig_DATA = indicate.pc
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/libindicate/indicate-interface.xml b/libindicate/indicate-interface.xml
new file mode 100644
index 0000000..d1fed7e
--- /dev/null
+++ b/libindicate/indicate-interface.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+	<interface name="org.freedesktop.indicator">
+
+<!-- Functions -->
+		<method name="GetDesktop">
+			<arg type="s" name="desktop_file_uri" direction="out" />
+		</method>
+		<method name="GetIndicatorCount">
+			<arg type="u" name="indicator_count" direction="out" />
+		</method>
+		<method name="GetIndicatorCountByType">
+			<arg type="s" name="type" direction="in" />
+			<arg type="u" name="indicator_count" direction="out" />
+		</method>
+		<method name="GetIndicatorList">
+			<arg type="ai" name="indicators" direction="out" />
+		</method>
+		<method name="GetIndicatorListByType">
+			<arg type="s" name="type" direction="in" />
+			<arg type="ai" name="indicators" direction="out" />
+		</method>
+		<method name="GetIndicatorProperty">
+			<arg type="u" name="id" direction="in" />
+			<arg type="s" name="property" direction="in" />
+			<arg type="s" name="value" direction="out" />
+		</method>
+		<method name="GetIndicatorPropertyGroup">
+			<arg type="u" name="id" direction="in" />
+			<arg type="as" name="properties" direction="in" />
+			<arg type="as" name="values" direction="out" />
+		</method>
+		<method name="GetIndicatorProperties">
+			<arg type="u" name="id" direction="in" />
+			<arg type="as" name="properties" direction="out" />
+		</method>
+		<method name="ShowIndicatorToUser">
+			<arg type="u" name="id" direction="in" />
+		</method>
+
+
+<!-- Signals -->
+		<signal name="IndicatorAdded">
+			<arg type="u" name="id" direction="out" />
+			<arg type="s" name="type" direction="out" />
+		</signal>
+		<signal name="IndicatorRemoved">
+			<arg type="u" name="id" direction="out" />
+			<arg type="s" name="type" direction="out" />
+		</signal>
+		<signal name="IndicatorModified">
+			<arg type="u" name="id" direction="out" />
+			<arg type="s" name="property" direction="out" />
+		</signal>
+
+
+<!-- End of interesting stuff -->
+
+	</interface>
+</node>
diff --git a/libindicate/indicate-server.xml b/libindicate/indicate-server.xml
deleted file mode 100644
index d1fed7e..0000000
--- a/libindicate/indicate-server.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/">
-	<interface name="org.freedesktop.indicator">
-
-<!-- Functions -->
-		<method name="GetDesktop">
-			<arg type="s" name="desktop_file_uri" direction="out" />
-		</method>
-		<method name="GetIndicatorCount">
-			<arg type="u" name="indicator_count" direction="out" />
-		</method>
-		<method name="GetIndicatorCountByType">
-			<arg type="s" name="type" direction="in" />
-			<arg type="u" name="indicator_count" direction="out" />
-		</method>
-		<method name="GetIndicatorList">
-			<arg type="ai" name="indicators" direction="out" />
-		</method>
-		<method name="GetIndicatorListByType">
-			<arg type="s" name="type" direction="in" />
-			<arg type="ai" name="indicators" direction="out" />
-		</method>
-		<method name="GetIndicatorProperty">
-			<arg type="u" name="id" direction="in" />
-			<arg type="s" name="property" direction="in" />
-			<arg type="s" name="value" direction="out" />
-		</method>
-		<method name="GetIndicatorPropertyGroup">
-			<arg type="u" name="id" direction="in" />
-			<arg type="as" name="properties" direction="in" />
-			<arg type="as" name="values" direction="out" />
-		</method>
-		<method name="GetIndicatorProperties">
-			<arg type="u" name="id" direction="in" />
-			<arg type="as" name="properties" direction="out" />
-		</method>
-		<method name="ShowIndicatorToUser">
-			<arg type="u" name="id" direction="in" />
-		</method>
-
-
-<!-- Signals -->
-		<signal name="IndicatorAdded">
-			<arg type="u" name="id" direction="out" />
-			<arg type="s" name="type" direction="out" />
-		</signal>
-		<signal name="IndicatorRemoved">
-			<arg type="u" name="id" direction="out" />
-			<arg type="s" name="type" direction="out" />
-		</signal>
-		<signal name="IndicatorModified">
-			<arg type="u" name="id" direction="out" />
-			<arg type="s" name="property" direction="out" />
-		</signal>
-
-
-<!-- End of interesting stuff -->
-
-	</interface>
-</node>
-- 
cgit v1.2.3