From fea68aa76b35f2d7de5127847a4f326bafccbeee Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Jan 2009 09:01:15 -0600 Subject: Making the signals use #defines to make everything a little more predictable. I hate this part of GObject signals. --- libindicate/listener.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libindicate/listener.h') diff --git a/libindicate/listener.h b/libindicate/listener.h index 511cdd3..934f0fd 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -20,6 +20,12 @@ G_BEGIN_DECLS #define INDICATE_IS_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), INDICATE_TYPE_LISTENER)) #define INDICATE_LISTENER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), INDICATE_TYPE_LISTENER, IndicateListenerClass)) +#define INDICATE_LISTENER_SIGNAL_INDICATOR_ADDED "indicator-added" +#define INDICATE_LISTENER_SIGNAL_INDICATOR_REMOVED "indicator-removed" +#define INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED "indicator-modified" +#define INDICATE_LISTENER_SIGNAL_SERVER_ADDED "server-added" +#define INDICATE_LISTENER_SIGNAL_SERVER_REMOVED "server-removed" + typedef gchar IndicateListenerServer; typedef guint IndicateListenerIndicator; -- cgit v1.2.3 From 63630dcba6ca194176a057a838a1e36e9df28cad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Jan 2009 09:07:14 -0600 Subject: Getting some helper defines for some of the hacks that'll probably change in the future --- libindicate/listener.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libindicate/listener.h') diff --git a/libindicate/listener.h b/libindicate/listener.h index 934f0fd..cadc487 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -26,6 +26,9 @@ G_BEGIN_DECLS #define INDICATE_LISTENER_SIGNAL_SERVER_ADDED "server-added" #define INDICATE_LISTENER_SIGNAL_SERVER_REMOVED "server-removed" +#define INDICATE_LISTENER_SERVER_DBUS_NAME(server) ((gchar *)server) +#define INDICATE_LISTENER_INDICATOR_ID(indicator) (GPOINTER_TO_UINT(indicator)) + typedef gchar IndicateListenerServer; typedef guint IndicateListenerIndicator; -- cgit v1.2.3 From 82c65bf328a43be2906c6a3feb6870dd352c15b3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Jan 2009 09:31:00 -0600 Subject: Okay, moving all of the variables from the listener class into a private object. This is to make the GObject introspection not need dbus, and thus we can reduce our build deps significantly. --- libindicate/listener.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'libindicate/listener.h') diff --git a/libindicate/listener.h b/libindicate/listener.h index cadc487..1bc5f8d 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -35,18 +35,6 @@ typedef guint IndicateListenerIndicator; typedef struct _IndicateListener IndicateListener; struct _IndicateListener { GObject parent; - - DBusGConnection * session_bus; - DBusGConnection * system_bus; - - DBusGProxy * dbus_proxy_session; - DBusGProxy * dbus_proxy_system; - - GHashTable * proxies_working; - GHashTable * proxies_possible; - - GArray * proxy_todo; - guint todo_idle; }; typedef struct _IndicateListenerClass IndicateListenerClass; -- cgit v1.2.3 From 116ff8e55859ffb43a747b218eb26bad990ea72d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Jan 2009 09:31:59 -0600 Subject: Oops, forgot the header there --- libindicate/listener.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'libindicate/listener.h') diff --git a/libindicate/listener.h b/libindicate/listener.h index 1bc5f8d..bc2332f 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -5,8 +5,6 @@ #include #include -#include - #include "indicator.h" #include "server.h" -- cgit v1.2.3