From 22ccedb4270f202065ce6e51a849c38b6c7645cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 14:58:19 -0600 Subject: Adding in the listeners interface --- libindicate/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'libindicate') diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 707d297..a086fa5 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -4,6 +4,7 @@ INCLUDES= \ EXTRA_DIST = \ indicate-interface.xml \ + indicate-listener.xml \ listener-marshal.list \ indicate.pc.in -- cgit v1.2.3 From 87a945852017be0f31e6fce5ae3f2a1166a84b8f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 15:14:07 -0600 Subject: Adding build instructions for the listener interface --- libindicate/Makefile.am | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libindicate') diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 5d50352..380687a 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -64,6 +64,20 @@ dbus-indicate-client.h: indicate-interface.xml --output=dbus-indicate-client.h \ $(srcdir)/indicate-interface.xml +dbus-listener-server.h: indicate-listener.xml + dbus-binding-tool \ + --prefix=indicate_listener \ + --mode=glib-server \ + --output=dbus-listener-server.h \ + $(srcdir)/indicate-listener.xml + +dbus-listener-client.h: indicate-listener.xml + dbus-binding-tool \ + --prefix=indicate_listener \ + --mode=glib-client \ + --output=dbus-listener-client.h \ + $(srcdir)/indicate-listener.xml + listener-marshal.h: $(srcdir)/listener-marshal.list glib-genmarshal --header \ --prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \ -- cgit v1.2.3 From e792f8a058235bdff3d6646342c91abeadeb9819 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 15:14:26 -0600 Subject: true is TRUE --- libindicate/listener.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index 6feb6d7..747c9f8 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -287,7 +287,7 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c /* g_debug("Name change on %s bus: '%s' from '%s' to '%s'", bus_name, name, prev, new); */ if (prev != NULL && prev[0] == '\0') { - todo_list_add(name, proxy, listener, false); + todo_list_add(name, proxy, listener, FALSE); } if (new != NULL && new[0] == '\0') { proxy_t * proxyt; @@ -370,7 +370,7 @@ build_todo_list_cb (DBusGProxy * proxy, char ** names, GError * error, void * da guint i = 0; for (i = 0; names[i] != NULL; i++) { - todo_list_add(names[i], proxy, listener, true); + todo_list_add(names[i], proxy, listener, TRUE); } return; -- cgit v1.2.3 From cb288de59d9cbbbcb80744ca6c5ff1390a5305c3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 15:33:12 -0600 Subject: Forgot to put these in built sources --- libindicate/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libindicate') diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 380687a..5528d1d 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -11,6 +11,8 @@ EXTRA_DIST = \ BUILT_SOURCES = \ dbus-indicate-server.h \ dbus-indicate-client.h \ + dbus-listener-server.h \ + dbus-listener-client.h \ listener-marshal.c \ listener-marshal.h -- cgit v1.2.3 From d5ba977e05b34e40115a976febd47e14d0f1afd1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 15:33:32 -0600 Subject: Linking in the build interfaces, needed a temporary function to get linking right --- libindicate/listener.c | 9 +++++++++ libindicate/listener.h | 1 + 2 files changed, 10 insertions(+) (limited to 'libindicate') diff --git a/libindicate/listener.c b/libindicate/listener.c index 747c9f8..b786552 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -31,6 +31,8 @@ License version 3 and version 2.1 along with this program. If not, see #include "listener-marshal.h" #include #include "dbus-indicate-client.h" +#include "dbus-listener-client.h" +#include "dbus-listener-server.h" /* Errors */ enum { @@ -791,6 +793,13 @@ indicate_listener_get_property_icon (IndicateListener * listener, IndicateListen return get_property_helper(listener, server, indicator, property, G_CALLBACK(callback), data, PROPERTY_TYPE_ICON); } +gboolean +indicate_listener_get_indicator_servers (IndicateListener * listener, GList * servers) +{ + + +} + static void listener_display_cb (DBusGProxy *proxy, GError *error, gpointer userdata) { diff --git a/libindicate/listener.h b/libindicate/listener.h index ed40630..f931b04 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -109,6 +109,7 @@ void indicate_listener_get_property_icon (IndicateListener * l void indicate_listener_display (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator); +gboolean indicate_listener_get_indicator_servers (IndicateListener * listener, GList * servers); void indicate_listener_server_get_type (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_server_property_cb callback, -- cgit v1.2.3 From c1663bcfddcb90cb434a7bef06ac3d25ae35c675 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Mar 2009 17:02:47 +0200 Subject: Fix doubling of prototypes, patch from Eitan --- libindicate/indicator.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'libindicate') diff --git a/libindicate/indicator.h b/libindicate/indicator.h index 5faea3c..8af5568 100644 --- a/libindicate/indicator.h +++ b/libindicate/indicator.h @@ -78,9 +78,6 @@ GType indicate_indicator_get_type(void) G_GNUC_CONST; IndicateIndicator * indicate_indicator_new (void); -/* Should these just be GObject properties? */ -void indicate_indicator_set_property (IndicateIndicator * indicator, const gchar * property_name, const gchar * property_value); - /* Show and hide this indicator */ void indicate_indicator_show (IndicateIndicator * indicator); void indicate_indicator_hide (IndicateIndicator * indicator); -- cgit v1.2.3 From cad75161c3193652507cba2cafec732a0757ae03 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 Mar 2009 19:21:22 +0200 Subject: Fixes for distcheck --- libindicate/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libindicate') diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 5528d1d..b851919 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -34,6 +34,8 @@ libindicate_la_SOURCES = \ $(indicate_headers) \ dbus-indicate-server.h \ dbus-indicate-client.h \ + dbus-listener-server.h \ + dbus-listener-client.h \ server.c \ listener.c \ listener-marshal.c \ -- cgit v1.2.3