diff options
| -rw-r--r-- | libindicate/Makefile.am | 33 | ||||
| -rw-r--r-- | libindicate/indicate-interface.xml (renamed from libindicate/indicate-server.xml) | 0 | ||||
| -rw-r--r-- | libindicate/listener-marshal.list | 6 | ||||
| -rw-r--r-- | libindicate/listener.c | 510 | ||||
| -rw-r--r-- | libindicate/listener.h | 68 | ||||
| -rw-r--r-- | libindicate/server.h | 2 | ||||
| -rw-r--r-- | libindicate/tests/Makefile.am | 14 | ||||
| -rw-r--r-- | libindicate/tests/listen-and-print.c | 51 |
8 files changed, 678 insertions, 6 deletions
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 3dd211d..53917b7 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -5,10 +5,13 @@ 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 \ + listener-marshal.c \ + listener-marshal.h lib_LTLIBRARIES = \ libindicate.la @@ -17,6 +20,7 @@ libindicateincludedir=$(includedir)/libindicate-1.0/libindicate indicate_headers = \ indicator.h \ + listener.h \ server.h libindicateinclude_HEADERS = \ @@ -25,7 +29,11 @@ libindicateinclude_HEADERS = \ libindicate_la_SOURCES = \ $(indicate_headers) \ dbus-indicate-server.h \ + dbus-indicate-client.h \ server.c \ + listener.c \ + listener-marshal.c \ + listener-marshal.h \ indicator.c libindicate_la_LDFLAGS = \ @@ -39,12 +47,29 @@ 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 + +listener-marshal.h: listener-marshal.list + libtool --mode=execute glib-genmarshal --header \ + --prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \ + > listener-marshal.h + +listener-marshal.c: listener-marshal.list + libtool --mode=execute glib-genmarshal --body \ + --prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \ + > listener-marshal.c pkgconfig_DATA = indicate.pc pkgconfigdir = $(libdir)/pkgconfig diff --git a/libindicate/indicate-server.xml b/libindicate/indicate-interface.xml index d1fed7e..d1fed7e 100644 --- a/libindicate/indicate-server.xml +++ b/libindicate/indicate-interface.xml diff --git a/libindicate/listener-marshal.list b/libindicate/listener-marshal.list new file mode 100644 index 0000000..562d06f --- /dev/null +++ b/libindicate/listener-marshal.list @@ -0,0 +1,6 @@ +# IndicatorAdded, IndicatorRemoved, IndicatorModified +VOID:UINT,STRING +# Local indicator_added, indicator_removed +VOID:POINTER,POINTER,STRING +# Local indicator_modified +VOID:POINTER,POINTER,STRING,STRING diff --git a/libindicate/listener.c b/libindicate/listener.c new file mode 100644 index 0000000..bf613d6 --- /dev/null +++ b/libindicate/listener.c @@ -0,0 +1,510 @@ + +#include "listener.h" +#include "listener-marshal.h" +#include <dbus/dbus-glib-bindings.h> +#include "dbus-indicate-client.h" + +/* Errors */ +enum { + LAST_ERROR +}; + +/* Signals */ +enum { + INDICATOR_ADDED, + INDICATOR_REMOVED, + INDICATOR_MODIFIED, + SERVER_ADDED, + SERVER_REMOVED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +typedef struct { + DBusGProxy * proxy; + gchar * name; + IndicateListener * listener; + GHashTable * indicators; +} proxy_t; + +typedef struct { + DBusGConnection * bus; + gchar * name; +} proxy_todo_t; + +G_DEFINE_TYPE (IndicateListener, indicate_listener, G_TYPE_OBJECT); + +/* Prototypes */ +static void indicate_listener_finalize (GObject * obj); +static void dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, IndicateListener * listener); +static void proxy_struct_destroy (gpointer data); +static void build_todo_list_cb (DBusGProxy * proxy, char ** names, GError * error, void * data); +static void todo_list_add (const gchar * name, DBusGProxy * proxy, IndicateListener * listener); +static gboolean todo_idle (gpointer data); +static void proxy_indicator_added (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt); +static void proxy_indicator_removed (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt); +static void proxy_indicator_modified (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt); +static void proxy_get_indicator_list (DBusGProxy * proxy, GArray * indicators, GError * error, gpointer data); +static void proxy_get_indicator_type (DBusGProxy * proxy, gchar * type, GError * error, gpointer data); +static void proxy_indicators_free (gpointer data); + +/* Code */ +static void +indicate_listener_class_init (IndicateListenerClass * class) +{ + /* g_debug("Listener Class Initialized"); */ + GObjectClass * gobj; + gobj = G_OBJECT_CLASS(class); + + gobj->finalize = indicate_listener_finalize; + + signals[INDICATOR_ADDED] = g_signal_new("indicator-added", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicateListenerClass, indicator_added), + NULL, NULL, + indicate_listener_marshal_VOID__POINTER_POINTER_STRING, + G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING); + signals[INDICATOR_REMOVED] = g_signal_new("indicator-removed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicateListenerClass, indicator_removed), + NULL, NULL, + indicate_listener_marshal_VOID__POINTER_POINTER_STRING, + G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING); + signals[INDICATOR_MODIFIED] = g_signal_new("indicator-modified", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicateListenerClass, indicator_modified), + NULL, NULL, + indicate_listener_marshal_VOID__POINTER_POINTER_STRING_STRING, + G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); + signals[SERVER_ADDED] = g_signal_new("server-added", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicateListenerClass, server_added), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); + signals[SERVER_REMOVED] = g_signal_new("server-removed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicateListenerClass, server_removed), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); + + dbus_g_object_register_marshaller(indicate_listener_marshal_VOID__UINT_STRING, + G_TYPE_NONE, + G_TYPE_UINT, + G_TYPE_STRING, + G_TYPE_INVALID); + + return; +} + +static void +indicate_listener_init (IndicateListener * listener) +{ + /* g_debug("Listener Object Initialized"); */ + GError *error = NULL; + + /* Get the buses */ + listener->session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); + if (error != NULL) { + g_error("Unable to get session bus: %s", error->message); + g_error_free(error); + return; + } + + listener->system_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + if (error != NULL) { + g_error("Unable to get system bus: %s", error->message); + g_error_free(error); + return; + } + + /* Set up the DBUS service proxies */ + listener->dbus_proxy_session = dbus_g_proxy_new_for_name_owner (listener->session_bus, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + &error); + if (error != NULL) { + g_error("Unable to get dbus proxy on session bus: %s", error->message); + g_error_free(error); + return; + } + + listener->dbus_proxy_system = dbus_g_proxy_new_for_name_owner (listener->system_bus, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + &error); + if (error != NULL) { + g_error("Unable to get dbus proxy on system bus: %s", error->message); + g_error_free(error); + return; + } + + /* Set up name change signals */ + dbus_g_proxy_add_signal(listener->dbus_proxy_session, "NameOwnerChanged", + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_connect_signal(listener->dbus_proxy_session, "NameOwnerChanged", + G_CALLBACK(dbus_owner_change), listener, NULL); + dbus_g_proxy_add_signal(listener->dbus_proxy_system, "NameOwnerChanged", + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_connect_signal(listener->dbus_proxy_system, "NameOwnerChanged", + G_CALLBACK(dbus_owner_change), listener, NULL); + + /* Initialize Data structures */ + listener->proxies_working = g_hash_table_new(g_str_hash, g_str_equal); + listener->proxies_possible = g_hash_table_new(g_str_hash, g_str_equal); + + /* TODO: Look at some common scenarios and find out how to make this sized */ + listener->proxy_todo = g_array_new(FALSE, TRUE, sizeof(proxy_todo_t)); + listener->todo_idle = 0; + + /* WARNING */ + /* Starting massive asynchronisity */ + /* */ + + /* Build todo list */ + org_freedesktop_DBus_list_names_async (listener->dbus_proxy_session, build_todo_list_cb, listener); + org_freedesktop_DBus_list_names_async (listener->dbus_proxy_system, build_todo_list_cb, listener); + + return; +} + +static void +indicate_listener_finalize (GObject * obj) +{ + IndicateListener * listener = INDICATE_LISTENER(obj); + + return; +} + +IndicateListener * +indicate_listener_new (void) +{ + IndicateListener * listener; + listener = g_object_new(INDICATE_TYPE_LISTENER, NULL); + return listener; +} + +static void +dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, IndicateListener * listener) +{ + DBusGConnection * bus; + gchar * bus_name; + if (proxy == listener->dbus_proxy_system) { + bus = listener->system_bus; + bus_name = "system"; + } else { + bus = listener->session_bus; + bus_name = "session"; + } + + /* 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); + } + if (new != NULL && new[0] == '\0') { + proxy_t * proxyt; + proxyt = g_hash_table_lookup(listener->proxies_working, name); + if (proxyt != NULL) { + g_hash_table_remove(listener->proxies_working, name); + proxy_struct_destroy(proxyt); + } + proxyt = g_hash_table_lookup(listener->proxies_possible, name); + if (proxyt != NULL) { + g_hash_table_remove(listener->proxies_possible, name); + proxy_struct_destroy(proxyt); + } + } + + return; +} + +static void +proxy_struct_destroy_indicators (gpointer key, gpointer value, gpointer data) +{ + gchar * type = (gchar *)key; + GHashTable * indicators = (GHashTable *)value; + proxy_t * proxy_data = data; + + GList * keys = g_hash_table_get_keys(indicators); + GList * indicator; + for (indicator = keys; indicator != NULL; indicator = indicator->next) { + guint id = (guint)indicator->data; + g_signal_emit(proxy_data->listener, signals[INDICATOR_REMOVED], 0, proxy_data->name, id, type, TRUE); + } + g_list_free(keys); + + g_hash_table_remove_all(indicators); + return; +} + +static void +proxy_struct_destroy (gpointer data) +{ + proxy_t * proxy_data = data; + + /* TODO: Clear the indicators by signaling */ + if (proxy_data->indicators != NULL) { + g_hash_table_foreach(proxy_data->indicators, + proxy_struct_destroy_indicators, + proxy_data); + g_hash_table_remove_all(proxy_data->indicators); + + g_signal_emit(proxy_data->listener, signals[SERVER_REMOVED], 0, proxy_data->name, TRUE); + proxy_data->indicators = NULL; + } + + g_free(proxy_data->name); + g_free(proxy_data); + + return; +} + +static void +build_todo_list_cb (DBusGProxy * proxy, char ** names, GError * error, void * data) +{ + IndicateListener * listener = INDICATE_LISTENER(data); + + if (error != NULL) { + g_warning("Unable to get names: %s", error->message); + return; + } + + guint i = 0; + for (i = 0; names[i] != NULL; i++) { + todo_list_add(names[i], proxy, listener); + } + + return; +} + +static void +todo_list_add (const gchar * name, DBusGProxy * proxy, IndicateListener * listener) +{ + DBusGConnection * bus; + gchar * bus_name; + if (proxy == listener->dbus_proxy_system) { + bus = listener->system_bus; + bus_name = "system"; + } else { + bus = listener->session_bus; + bus_name = "session"; + } + /* g_debug ("Adding on %s bus: %s", bus_name, name); */ + + proxy_todo_t todo; + todo.name = g_strdup(name); + todo.bus = bus; + + g_array_append_val(listener->proxy_todo, todo); + + if (listener->todo_idle == 0) { + listener->todo_idle = g_idle_add(todo_idle, listener); + } + + return; +} + +gboolean +todo_idle (gpointer data) +{ + IndicateListener * listener = INDICATE_LISTENER(data); + if (listener == NULL) { + g_error("Listener got lost in todo_idle"); + listener->todo_idle = 0; + return FALSE; + } + + if (listener->proxy_todo->len == 0) { + /* Basically if we have no todo, we need to stop running. This + * is done this way to make the function error handling simpler + * and results in an extra run */ + listener->todo_idle = 0; + return FALSE; + } + + proxy_todo_t * todo = &g_array_index(listener->proxy_todo, proxy_todo_t, listener->proxy_todo->len - 1); + + proxy_t * proxyt = g_new(proxy_t, 1); + proxyt->name = todo->name; + proxyt->proxy = dbus_g_proxy_new_for_name(todo->bus, + proxyt->name, + "/org/freedesktop/indicate", + "org.freedesktop.indicator"); + proxyt->listener = listener; + proxyt->indicators = NULL; + + listener->proxy_todo = g_array_remove_index(listener->proxy_todo, listener->proxy_todo->len - 1); + + if (proxyt->proxy == NULL) { + g_warning("Unable to create proxy for %s", proxyt->name); + return TRUE; + } + + dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorAdded", + G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorAdded", + G_CALLBACK(proxy_indicator_added), proxyt, NULL); + + org_freedesktop_indicator_get_indicator_list_async(proxyt->proxy, proxy_get_indicator_list, proxyt); + + g_hash_table_insert(listener->proxies_possible, proxyt->name, proxyt); + + return TRUE; +} + +typedef struct { + guint id; + proxy_t * proxyt; +} indicator_type_t; + +static void +proxy_get_indicator_list (DBusGProxy * proxy, GArray * indicators, GError * error, gpointer data) +{ + if (error != NULL) { + return; + } + + proxy_t * proxyt = (proxy_t *)data; + + int i; + for (i = 0; i < indicators->len; i++) { + indicator_type_t * itt = g_new(indicator_type_t, 1); + itt->id = g_array_index(indicators, guint, i); + itt->proxyt = proxyt; + + org_freedesktop_indicator_get_indicator_property_async(proxyt->proxy, itt->id, "type", proxy_get_indicator_type, itt); + } + + return; +} + +static void +proxy_get_indicator_type (DBusGProxy * proxy, gchar * type, GError * error, gpointer data) +{ + if (error != NULL) { + g_warning("Get Indicator Type returned error: %s", error->message); + return; + } + + indicator_type_t * itt = (indicator_type_t *)data; + guint id = itt->id; + proxy_t * proxyt = itt->proxyt; + + g_free(itt); + + return proxy_indicator_added(proxy, id, type, proxyt); +} + +static void +proxy_indicator_added (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt) +{ + /* g_debug("Interface %s has an indicator %d of type %s", proxyt->name, id, type); */ + + if (proxyt->indicators == NULL) { + proxyt->indicators = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, proxy_indicators_free); + /* Elevate to working */ + g_hash_table_remove(proxyt->listener->proxies_possible, proxyt->name); + g_hash_table_insert(proxyt->listener->proxies_working, proxyt->name, proxyt); + + dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorRemoved", + G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorRemoved", + G_CALLBACK(proxy_indicator_removed), proxyt, NULL); + dbus_g_proxy_add_signal(proxyt->proxy, "IndicatorModified", + G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(proxyt->proxy, "IndicatorModified", + G_CALLBACK(proxy_indicator_modified), proxyt, NULL); + + g_signal_emit(proxyt->listener, signals[SERVER_ADDED], 0, proxyt->name, TRUE); + } + + GHashTable * indicators = g_hash_table_lookup(proxyt->indicators, type); + + if (indicators == NULL) { + indicators = g_hash_table_new(g_direct_hash, g_direct_equal); + g_hash_table_insert(proxyt->indicators, g_strdup(type), indicators); + } + + if (!g_hash_table_lookup(indicators, (gpointer)id)) { + g_hash_table_insert(indicators, (gpointer)id, (gpointer)TRUE); + g_signal_emit(proxyt->listener, signals[INDICATOR_ADDED], 0, proxyt->name, id, type, TRUE); + } + + return; +} + +static void +proxy_indicator_removed (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt) +{ + if (proxyt->indicators == NULL) { + g_warning("Oddly we had an indicator removed from an interface that we didn't think had indicators."); + return; + } + + GHashTable * indicators = g_hash_table_lookup(proxyt->indicators, type); + if (indicators == NULL) { + g_warning("Can not remove indicator %d of type '%s' as there are no indicators of that type on %s.", id, type, proxyt->name); + return; + } + + if (!g_hash_table_lookup(indicators, (gpointer)id)) { + g_warning("No indicator %d of type '%s' on '%s'.", id, type, proxyt->name); + return; + } + + g_hash_table_remove(indicators, (gpointer)id); + g_signal_emit(proxyt->listener, signals[INDICATOR_REMOVED], 0, proxyt->name, id, type, TRUE); + + return; +} + +static void +proxy_indicator_modified (DBusGProxy * proxy, guint id, const gchar * type, proxy_t * proxyt) +{ + if (proxyt->indicators == NULL) { + g_warning("Oddly we had an indicator modified from an interface that we didn't think had indicators."); + return; + } + + // TODO: Search for the ID to discover the type + GHashTable * indicators = g_hash_table_lookup(proxyt->indicators, type); + if (indicators == NULL) { + g_warning("Can not modify indicator %d of type '%s' as there are no indicators of that type on %s.", id, type, proxyt->name); + return; + } + + if (!g_hash_table_lookup(indicators, (gpointer)id)) { + g_warning("No indicator %d of type '%s' on '%s'.", id, type, proxyt->name); + return; + } + + g_signal_emit(proxyt->listener, signals[INDICATOR_MODIFIED], 0, proxyt->name, id, type, type, TRUE); + + return; +} + +static void +proxy_indicators_free (gpointer data) +{ + GHashTable * table = (GHashTable *)data; + + if (g_hash_table_size(table) != 0) { + g_warning("Clearning a set of indicators that wasn't signaled!"); + } + + g_hash_table_unref(table); + return; +} diff --git a/libindicate/listener.h b/libindicate/listener.h new file mode 100644 index 0000000..c40bc07 --- /dev/null +++ b/libindicate/listener.h @@ -0,0 +1,68 @@ + +#ifndef INDICATE_LISTENER_H_INCLUDED__ +#define INDICATE_LISTENER_H_INCLUDED__ 1 + +#include <glib.h> +#include <glib-object.h> + +#include <dbus/dbus-glib.h> + +#include "indicator.h" +#include "server.h" + +G_BEGIN_DECLS + +/* Boilerplate */ +#define INDICATE_TYPE_LISTENER (indicate_listener_get_type ()) +#define INDICATE_LISTENER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_LISTENER, IndicateListener)) +#define INDICATE_IS_LISTENER(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), INDICATE_TYPE_LISTENER)) +#define INDICATE_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), INDICATE_TYPE_LISTENER, IndicateListenerClass)) +#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)) + +typedef gchar IndicateListenerServer; +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; +struct _IndicateListenerClass { + GObjectClass parent; + + /* Signals */ + void (* indicator_added) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type); + void (* indicator_removed) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type); + void (* indicator_modified) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property); + + void (* server_added) (IndicateListenerServer * server); + void (* server_removed) (IndicateListenerServer * server); +}; + +GType indicate_listener_get_type (void) G_GNUC_CONST; + +/* Create a new listener */ +IndicateListener * indicate_listener_new (void); + + + + + +G_END_DECLS + +#endif /* INDICATE_LISTENER_H_INCLUDED__ */ + diff --git a/libindicate/server.h b/libindicate/server.h index fe3ec28..bc4522d 100644 --- a/libindicate/server.h +++ b/libindicate/server.h @@ -92,5 +92,5 @@ gboolean indicate_server_show_indicator_to_user (IndicateServer * server, guint G_END_DECLS -#endif /* INDICATE_INDICATOR_H_INCLUDED__ */ +#endif /* INDICATE_SERVER_H_INCLUDED__ */ diff --git a/libindicate/tests/Makefile.am b/libindicate/tests/Makefile.am index 814a50b..208da5b 100644 --- a/libindicate/tests/Makefile.am +++ b/libindicate/tests/Makefile.am @@ -1,7 +1,8 @@ noinst_PROGRAMS = \ indicate-and-crash \ - indicate-alot + indicate-alot \ + listen-and-print indicate_and_crash_SOURCES = \ indicate-and-crash.c @@ -24,3 +25,14 @@ indicate_alot_CFLAGS = \ indicate_alot_LDADD = \ ../libindicate.la \ $(LIBINDICATE_LIBS) + +listen_and_print_SOURCES = \ + listen-and-print.c + +listen_and_print_CFLAGS = \ + -I $(srcdir)/../.. \ + $(LIBINDICATE_CFLAGS) + +listen_and_print_LDADD = \ + ../libindicate.la \ + $(LIBINDICATE_LIBS) diff --git a/libindicate/tests/listen-and-print.c b/libindicate/tests/listen-and-print.c new file mode 100644 index 0000000..9ad2cc8 --- /dev/null +++ b/libindicate/tests/listen-and-print.c @@ -0,0 +1,51 @@ + +#include <glib.h> +#include "libindicate/listener.h" + +static void +indicator_added (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) +{ + g_debug("Indicator Added: %s %d %s", (gchar *)server, (guint)indicator, type); +} + +static void +indicator_removed (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data) +{ + g_debug("Indicator Removed: %s %d %s", (gchar *)server, (guint)indicator, type); +} + +static void +indicator_modified (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property, gpointer data) +{ + g_debug("Indicator Modified: %s %d %s %s", (gchar *)server, (guint)indicator, type, property); +} + +static void +server_added (IndicateListener * listener, IndicateListenerServer * server, gpointer data) +{ + g_debug("Indicator Server Added: %s", (gchar *)server); +} + +static void +server_removed (IndicateListener * listener, IndicateListenerServer * server, gpointer data) +{ + g_debug("Indicator Server Removed: %s", (gchar *)server); +} + +int +main (int argc, char ** argv) +{ + g_type_init(); + + IndicateListener * listener = indicate_listener_new(); + + g_signal_connect(listener, "indicator-added", G_CALLBACK(indicator_added), NULL); + g_signal_connect(listener, "indicator-removed", G_CALLBACK(indicator_removed), NULL); + g_signal_connect(listener, "indicator-modified", G_CALLBACK(indicator_modified), NULL); + g_signal_connect(listener, "server-added", G_CALLBACK(server_added), NULL); + g_signal_connect(listener, "server-removed", G_CALLBACK(server_removed), NULL); + + g_main_loop_run(g_main_loop_new(NULL, FALSE)); + + return 0; +} |