Moving the listener code and some indicator code into libindicate-gtk

7 files changed, 70 insertions, 131 deletions

diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am
index a6a50fa..6112b5f 100644
--- a/libindicate-gtk/Makefile.am
+++ b/libindicate-gtk/Makefile.am
@@ -11,14 +11,16 @@ lib_LTLIBRARIES = \
 libindicate_gtkincludedir=$(includedir)/libindicate-0.1/libindicate-gtk
 
 indicate_gtk_headers = \
-	indicator.h
+	indicator.h \
+	listener.h
 
 libindicate_gtkinclude_HEADERS = \
 	$(indicate_gtk_headers)
 
 libindicate_gtk_la_SOURCES = \
 	$(indicate_gtk_headers) \
-	indicator.c
+	indicator.c \
+	listener.c
 
 libindicate_gtk_la_LDFLAGS = \
 	-version-info $(LIBINDICATE_CURRENT):$(LIBINDICATE_REVISION):$(LIBINDICATE_AGE) \
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index a35cf35..d4746fb 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -53,6 +53,7 @@ libindicate_la_SOURCES = \
 	listener.c \
 	listener-marshal.c \
 	listener-marshal.h \
+	listener-private.h \
 	indicator.c \
 	indicator-message.c \
 	interests-priv.h
diff --git a/libindicate/indicator.c b/libindicate/indicator.c
index 92712bd..cb257eb 100644
--- a/libindicate/indicator.c
+++ b/libindicate/indicator.c
@@ -381,50 +381,6 @@ indicate_indicator_set_property (IndicateIndicator * indicator, const gchar * ke
 }
 
 /**
-	indicate_indicator_set_property_icon:
-	@indicator: a #IndicateIndicator to act on
-	@key: name of the property
-	@data: icon to set property with
-
-	This is a helper function that wraps around #indicate_indicator_set_property
-	but takes an #GdkPixbuf parameter.  It then takes the @data
-	parameter, turns it into a PNG, base64 encodes it and then
-	uses that data to call #indicate_indicator_set_property.
-*/
-void
-indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar * key, const GdkPixbuf * data)
-{
-	if (!GDK_IS_PIXBUF(data)) {
-		g_warning("Invalide GdkPixbuf");
-		return;
-	}
-
-	GError * error = NULL;
-	gchar * png_data;
-	gsize png_data_len;
-
-	if (!gdk_pixbuf_save_to_buffer((GdkPixbuf *)data, &png_data, &png_data_len, "png", &error, NULL)) {
-		if (error == NULL) {
-			g_warning("Unable to create pixbuf data stream: %d", png_data_len);
-		} else {
-			g_warning("Unable to create pixbuf data stream: %s", error->message);
-			g_error_free(error);
-			error = NULL;
-		}
-
-		return;
-	}
-
-	gchar * prop_str = g_base64_encode((guchar *)png_data, png_data_len);
-	indicate_indicator_set_property(indicator, key, prop_str);
-
-	g_free(prop_str);
-	g_free(png_data);
-
-	return;
-}
-
-/**
 	indicate_indicator_set_property_time:
 	@indicator: a #IndicateIndicator to act on
 	@key: name of the property
diff --git a/libindicate/indicator.h b/libindicate/indicator.h
index 118c6c0..20b998d 100644
--- a/libindicate/indicator.h
+++ b/libindicate/indicator.h
@@ -33,8 +33,6 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
 G_BEGIN_DECLS
 
 /* Boilerplate */
@@ -132,7 +130,6 @@ void indicate_indicator_user_display (IndicateIndicator * indicator);
 
 /* Properties handling */
 void indicate_indicator_set_property (IndicateIndicator * indicator, const gchar * key, const gchar * data);
-void indicate_indicator_set_property_icon (IndicateIndicator * indicator, const gchar * key, const GdkPixbuf * data);
 void indicate_indicator_set_property_time (IndicateIndicator * indicator, const gchar * key, GTimeVal * time);
 const gchar * indicate_indicator_get_property (IndicateIndicator * indicator, const gchar * key);
 GPtrArray * indicate_indicator_list_properties (IndicateIndicator * indicator);
diff --git a/libindicate/listener-private.h b/libindicate/listener-private.h
new file mode 100644
index 0000000..ea1b108
--- /dev/null
+++ b/libindicate/listener-private.h
@@ -0,0 +1,63 @@
+/*
+A library to allow applictions to provide simple indications of
+information to be displayed to users of the application through the
+interface shell.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of either or both of the following licenses:
+
+1) the GNU Lesser General Public License version 3, as published by the 
+Free Software Foundation; and/or
+2) the GNU Lesser General Public License version 2.1, as published by 
+the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the applicable version of the GNU Lesser General Public 
+License for more details.
+
+You should have received a copy of both the GNU Lesser General Public 
+License version 3 and version 2.1 along with this program.  If not, see 
+<http://www.gnu.org/licenses/>
+*/
+
+#ifndef INDICATE_LISTENER_PRIVATE_H__ 
+#define INDICATE_LISTENER_PRIVATE_H__ 1
+
+struct _IndicateListenerServer {
+	gchar * name;
+	DBusGProxy * proxy;
+	DBusGConnection * connection;
+	gboolean interests[INDICATE_INTEREST_LAST];
+};
+
+struct _IndicateListenerIndicator {
+	guint id;
+};
+
+typedef struct _IndicateListenerPrivate IndicateListenerPrivate;
+struct _IndicateListenerPrivate
+{
+	DBusGConnection * session_bus;
+	DBusGConnection * system_bus;
+
+	DBusGProxy * dbus_proxy_session;
+	DBusGProxy * dbus_proxy_system;
+
+	GList * proxies_working;
+	GList * proxies_possible;
+
+	GArray * proxy_todo;
+	guint todo_idle;
+};
+
+#define INDICATE_LISTENER_GET_PRIVATE(o) \
+		(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATE_TYPE_LISTENER, IndicateListenerPrivate))
+
+#endif /* INDICATE_LISTENER_PRIVATE_H__ */
diff --git a/libindicate/listener.c b/libindicate/listener.c
index 501d367..48ad616 100644
--- a/libindicate/listener.c
+++ b/libindicate/listener.c
@@ -54,35 +54,7 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-struct _IndicateListenerServer {
-	gchar * name;
-	DBusGProxy * proxy;
-	DBusGConnection * connection;
-	gboolean interests[INDICATE_INTEREST_LAST];
-};
-
-struct _IndicateListenerIndicator {
-	guint id;
-};
-
-typedef struct _IndicateListenerPrivate IndicateListenerPrivate;
-struct _IndicateListenerPrivate
-{
-	DBusGConnection * session_bus;
-	DBusGConnection * system_bus;
-
-	DBusGProxy * dbus_proxy_session;
-	DBusGProxy * dbus_proxy_system;
-
-	GList * proxies_working;
-	GList * proxies_possible;
-
-	GArray * proxy_todo;
-	guint todo_idle;
-};
-
-#define INDICATE_LISTENER_GET_PRIVATE(o) \
-		(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATE_TYPE_LISTENER, IndicateListenerPrivate))
+#include "listener-private.h"
 
 typedef struct {
 	DBusGProxy * proxy;
@@ -718,8 +690,7 @@ proxy_indicators_free (gpointer data)
 typedef enum _get_property_type get_property_type;
 enum _get_property_type {
 	PROPERTY_TYPE_STRING,
-	PROPERTY_TYPE_TIME,
-	PROPERTY_TYPE_ICON
+	PROPERTY_TYPE_TIME
 };
 
 typedef struct _get_property_t get_property_t;
@@ -750,44 +721,6 @@ get_property_cb (DBusGProxy *proxy, char * OUT_value, GError *error, gpointer us
 		cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, OUT_value, get_property_data->data);
 		break;
 	}
-	case PROPERTY_TYPE_ICON: {
-		indicate_listener_get_property_icon_cb cb = (indicate_listener_get_property_icon_cb)get_property_data->cb;
-
-		/* There is no icon */
-		if (OUT_value == NULL || OUT_value[0] == '\0') {
-			break;
-		}
-
-		gsize length = 0;
-		guchar * icondata = g_base64_decode(OUT_value, &length);
-		
-		GInputStream * input = g_memory_input_stream_new_from_data(icondata, length, NULL);
-		if (input == NULL) {
-			g_warning("Cound not create input stream from icon property data");
-			g_free(icondata);
-			break;
-		}
-
-		GError * error = NULL;
-		GdkPixbuf * icon = gdk_pixbuf_new_from_stream(input, NULL, &error);
-		if (icon != NULL) {
-			cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, icon, get_property_data->data);
-		}
-
-		if (error != NULL) {
-			g_warning("Unable to build Pixbuf from icon data: %s", error->message);
-			g_error_free(error);
-		}
-
-		error = NULL;
-		g_input_stream_close(input, NULL, &error);
-		if (error != NULL) {
-			g_warning("Unable to close input stream: %s", error->message);
-			g_error_free(error);
-		}
-		g_free(icondata);
-		break;
-	}
 	case PROPERTY_TYPE_TIME: {
 		indicate_listener_get_property_time_cb cb = (indicate_listener_get_property_time_cb)get_property_data->cb;
 		GTimeVal time;
@@ -834,12 +767,6 @@ indicate_listener_get_property_time (IndicateListener * listener, IndicateListen
 	return get_property_helper(listener, server, indicator, property, G_CALLBACK(callback), data, PROPERTY_TYPE_TIME);
 }
 
-void
-indicate_listener_get_property_icon (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, indicate_listener_get_property_icon_cb callback, gpointer data)
-{
-	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)
 {
diff --git a/libindicate/listener.h b/libindicate/listener.h
index 5bfd298..f2ed4b1 100644
--- a/libindicate/listener.h
+++ b/libindicate/listener.h
@@ -88,7 +88,6 @@ GType indicate_listener_get_type (void) G_GNUC_CONST;
 
 typedef void (*indicate_listener_get_property_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data);
 typedef void (*indicate_listener_get_property_time_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GTimeVal * propertydata, gpointer data);
-typedef void (*indicate_listener_get_property_icon_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data);
 typedef void (*indicate_listener_get_server_property_cb) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data);
 
 /* Create a new listener */
@@ -106,12 +105,6 @@ void                  indicate_listener_get_property_time  (IndicateListener * l
                                                             gchar * property,
                                                             indicate_listener_get_property_time_cb callback,
                                                             gpointer data);
-void                  indicate_listener_get_property_icon  (IndicateListener * listener,
-                                                            IndicateListenerServer * server,
-                                                            IndicateListenerIndicator * indicator,
-                                                            gchar * property,
-                                                            indicate_listener_get_property_icon_cb callback,
-                                                            gpointer data);
 void                  indicate_listener_display            (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator);