Import upstream version 0.2.91

1 files changed, 0 insertions, 879 deletions

diff --git a/src/indicator-application.c b/src/indicator-application.c
deleted file mode 100644
index ecf19e8..0000000
--- a/src/indicator-application.c
+++ /dev/null
@@ -1,879 +0,0 @@
-/*
-The indicator application visualization object.  It takes the information
-given by the service and turns it into real-world pixels that users can
-actually use.  Well, GTK does that, but this asks nicely.
-
-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 the GNU General Public License version 3, 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 GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* G Stuff */
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-/* DBus Stuff */
-#include <dbus/dbus-glib.h>
-#ifdef HAVE_GTK3
-#include <libdbusmenu-gtk3/menu.h>
-#else
-#include <libdbusmenu-gtk/menu.h>
-#endif
-
-/* Indicator Stuff */
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
-#include <libindicator/indicator-service-manager.h>
-#include <libindicator/indicator-image-helper.h>
-
-/* Local Stuff */
-#include "dbus-shared.h"
-#include "application-service-client.h"
-#include "application-service-marshal.h"
-
-#define PANEL_ICON_SUFFIX  "panel"
-
-#define INDICATOR_APPLICATION_TYPE            (indicator_application_get_type ())
-#define INDICATOR_APPLICATION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplication))
-#define INDICATOR_APPLICATION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass))
-#define IS_INDICATOR_APPLICATION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_APPLICATION_TYPE))
-#define IS_INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_APPLICATION_TYPE))
-#define INDICATOR_APPLICATION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass))
-
-typedef struct _IndicatorApplication      IndicatorApplication;
-typedef struct _IndicatorApplicationClass IndicatorApplicationClass;
-
-struct _IndicatorApplicationClass {
-	IndicatorObjectClass parent_class;
-};
-
-struct _IndicatorApplication {
-	IndicatorObject parent;
-};
-
-GType indicator_application_get_type (void);
-
-INDICATOR_SET_VERSION
-INDICATOR_SET_TYPE(INDICATOR_APPLICATION_TYPE)
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-typedef struct _IndicatorApplicationPrivate IndicatorApplicationPrivate;
-struct _IndicatorApplicationPrivate {
-	IndicatorServiceManager * sm;
-	DBusGConnection * bus;
-	DBusGProxy * service_proxy;
-	GList * applications;
-	GHashTable * theme_dirs;
-	guint disconnect_kill;
-};
-
-typedef struct _ApplicationEntry ApplicationEntry;
-struct _ApplicationEntry {
-	IndicatorObjectEntry entry;
-	gchar * icon_theme_path;
-	gboolean old_service;
-	gchar * dbusobject;
-	gchar * dbusaddress;
-	gchar * guide;
-	gchar * longname;
-};
-
-#define INDICATOR_APPLICATION_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_APPLICATION_TYPE, IndicatorApplicationPrivate))
-
-static void indicator_application_class_init (IndicatorApplicationClass *klass);
-static void indicator_application_init       (IndicatorApplication *self);
-static void indicator_application_dispose    (GObject *object);
-static void indicator_application_finalize   (GObject *object);
-static GList * get_entries (IndicatorObject * io);
-static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
-void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
-static void connected (IndicatorApplication * application);
-static void disconnected (IndicatorApplication * application);
-static void disconnected_helper (gpointer data, gpointer user_data);
-static gboolean disconnected_kill (gpointer user_data);
-static void disconnected_kill_helper (gpointer data, gpointer user_data);
-static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application);
-static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application);
-static void application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application);
-static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application);
-static void application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application);
-static void get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata);
-static void get_applications_helper (gpointer data, gpointer user_data);
-static void theme_dir_unref(IndicatorApplication * ia, const gchar * dir);
-static void theme_dir_ref(IndicatorApplication * ia, const gchar * dir);
-
-G_DEFINE_TYPE (IndicatorApplication, indicator_application, INDICATOR_OBJECT_TYPE);
-
-static void
-indicator_application_class_init (IndicatorApplicationClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (IndicatorApplicationPrivate));
-
-	object_class->dispose = indicator_application_dispose;
-	object_class->finalize = indicator_application_finalize;
-
-	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
-
-	io_class->get_entries = get_entries;
-	io_class->get_location = get_location;
-
-	dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING,
-	                                  G_TYPE_NONE,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_INT,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_INVALID);
-	dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING,
-	                                  G_TYPE_NONE,
-	                                  G_TYPE_INT,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_INVALID);
-	dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING_STRING,
-	                                  G_TYPE_NONE,
-	                                  G_TYPE_INT,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_STRING,
-	                                  G_TYPE_INVALID);
-
-	return;
-}
-
-static void
-indicator_application_init (IndicatorApplication *self)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(self);
-
-	/* These are built in the connection phase */
-	priv->bus = NULL;
-	priv->service_proxy = NULL;
-	priv->theme_dirs = NULL;
-	priv->disconnect_kill = 0;
-
-	priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR);	
-	g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
-
-	priv->applications = NULL;
-
-	priv->theme_dirs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-
-	return;
-}
-
-static void
-indicator_application_dispose (GObject *object)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(object);
-
-	if (priv->disconnect_kill != 0) {
-		g_source_remove(priv->disconnect_kill);
-	}
-
-	while (priv->applications != NULL) {
-		application_removed(priv->service_proxy,
-		                    0,
-		                    INDICATOR_APPLICATION(object));
-	}
-
-	if (priv->sm != NULL) {
-		g_object_unref(priv->sm);
-		priv->sm = NULL;
-	}
-
-	if (priv->bus != NULL) {
-		/* We're not incrementing the ref count on this one. */
-		priv->bus = NULL;
-	}
-
-	if (priv->service_proxy != NULL) {
-		g_object_unref(G_OBJECT(priv->service_proxy));
-		priv->service_proxy = NULL;
-	}
-
-	if (priv->theme_dirs != NULL) {
-		while (g_hash_table_size(priv->theme_dirs)) {
-			GList * keys = g_hash_table_get_keys(priv->theme_dirs);
-			theme_dir_unref(INDICATOR_APPLICATION(object), (gchar *)keys->data);
-		}
-		g_hash_table_destroy(priv->theme_dirs);
-		priv->theme_dirs = NULL;
-	}
-
-	G_OBJECT_CLASS (indicator_application_parent_class)->dispose (object);
-	return;
-}
-
-static void
-indicator_application_finalize (GObject *object)
-{
-
-	G_OBJECT_CLASS (indicator_application_parent_class)->finalize (object);
-	return;
-}
-
-/* Responds to connection change event from the service manager and
-   splits it into two. */
-void
-connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application)
-{
-	g_return_if_fail(IS_INDICATOR_APPLICATION(application));
-	if (connect) {
-		connected(application);
-	} else {
-		disconnected(application);
-	}
-	return;
-}
-
-/* Brings up the connection to a service that has just come onto the
-   bus, or is atleast new to us. */
-void
-connected (IndicatorApplication * application)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-	g_debug("Connected to Application Indicator Service.");
-
-	GError * error = NULL;
-
-	/* Grab the session bus */
-	if (priv->bus == NULL) {
-		priv->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;
-		}
-	}
-
-	if (priv->service_proxy == NULL) {
-	/* Build the service proxy */
-		priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus,
-		                                                INDICATOR_APPLICATION_DBUS_ADDR,
-		                                                INDICATOR_APPLICATION_DBUS_OBJ,
-		                                                INDICATOR_APPLICATION_DBUS_IFACE);
-
-		/* Set up proxy signals */
-		g_debug("Setup proxy signals");
-		dbus_g_proxy_add_signal(priv->service_proxy,
-	                        	"ApplicationAdded",
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_INT,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_INVALID);
-		dbus_g_proxy_add_signal(priv->service_proxy,
-	                        	"ApplicationRemoved",
-	                        	G_TYPE_INT,
-	                        	G_TYPE_INVALID);
-		dbus_g_proxy_add_signal(priv->service_proxy,
-	                        	"ApplicationIconChanged",
-	                        	G_TYPE_INT,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_INVALID);
-		dbus_g_proxy_add_signal(priv->service_proxy,
-	                        	"ApplicationIconThemePathChanged",
-	                        	G_TYPE_INT,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_INVALID);
-		dbus_g_proxy_add_signal(priv->service_proxy,
-	                        	"ApplicationLabelChanged",
-	                        	G_TYPE_INT,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_STRING,
-	                        	G_TYPE_INVALID);
-
-		/* Connect to them */
-		g_debug("Connect to them.");
-		dbus_g_proxy_connect_signal(priv->service_proxy,
-	                            	"ApplicationAdded",
-	                            	G_CALLBACK(application_added),
-	                            	application,
-	                            	NULL /* Disconnection Signal */);
-		dbus_g_proxy_connect_signal(priv->service_proxy,
-	                            	"ApplicationRemoved",
-	                            	G_CALLBACK(application_removed),
-	                            	application,
-	                            	NULL /* Disconnection Signal */);
-		dbus_g_proxy_connect_signal(priv->service_proxy,
-	                            	"ApplicationIconChanged",
-	                            	G_CALLBACK(application_icon_changed),
-	                            	application,
-	                            	NULL /* Disconnection Signal */);
-		dbus_g_proxy_connect_signal(priv->service_proxy,
-	                            	"ApplicationIconThemePathChanged",
-	                            	G_CALLBACK(application_icon_theme_path_changed),
-	                            	application,
-	                            	NULL /* Disconnection Signal */);
-		dbus_g_proxy_connect_signal(priv->service_proxy,
-	                            	"ApplicationLabelChanged",
-	                            	G_CALLBACK(application_label_changed),
-	                            	application,
-	                            	NULL /* Disconnection Signal */);
-	}
-
-	/* Query it for existing applications */
-	g_debug("Request current apps");
-	org_ayatana_indicator_application_service_get_applications_async(priv->service_proxy,
-	                                                                 get_applications,
-	                                                                 application);
-
-	return;
-}
-
-/* Marks every current application as belonging to the old
-   service so that we can delete it if it doesn't come back.
-   Also, sets up a timeout on comming back. */
-static void
-disconnected (IndicatorApplication * application)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-	g_list_foreach(priv->applications, disconnected_helper, application);
-	/* I'll like this to be a little shorter, but it's a bit
-	   inpractical to make it so.  This means that the user will
-	   probably notice a visible glitch.  Though, if applications
-	   are disappearing there isn't much we can do. */
-	priv->disconnect_kill = g_timeout_add(250, disconnected_kill, application);
-	return;
-}
-
-/* Marks an entry as being from the old service */
-static void
-disconnected_helper (gpointer data, gpointer user_data)
-{
-	ApplicationEntry * entry = (ApplicationEntry *)data;
-	entry->old_service = TRUE;
-	return;
-}
-
-/* Makes sure the old applications that don't come back
-   get dropped. */
-static gboolean
-disconnected_kill (gpointer user_data)
-{
-	g_return_val_if_fail(IS_INDICATOR_APPLICATION(user_data), FALSE);
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data);
-	priv->disconnect_kill = 0;
-	g_list_foreach(priv->applications, disconnected_kill_helper, user_data);
-	return FALSE;
-}
-
-/* Looks for entries that are still associated with the 
-   old service and removes them. */
-static void
-disconnected_kill_helper (gpointer data, gpointer user_data)
-{
-	g_return_if_fail(IS_INDICATOR_APPLICATION(user_data));
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data);
-	ApplicationEntry * entry = (ApplicationEntry *)data;
-	if (entry->old_service) {
-		application_removed(NULL, g_list_index(priv->applications, data), INDICATOR_APPLICATION(user_data));
-	}
-	return;
-}
-
-/* Goes through the list of applications that we're maintaining and
-   pulls out the IndicatorObjectEntry and returns that in a list
-   for the caller. */
-static GList *
-get_entries (IndicatorObject * io)
-{
-	g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), NULL);
-
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io);
-	GList * retval = NULL;
-	GList * apppointer = NULL;
-
-	for (apppointer = priv->applications; apppointer != NULL; apppointer = g_list_next(apppointer)) {
-		IndicatorObjectEntry * entry = &(((ApplicationEntry *)apppointer->data)->entry);
-		retval = g_list_prepend(retval, entry);
-	}
-
-	if (retval != NULL) {
-		retval = g_list_reverse(retval);
-	}
-
-	return retval;
-}
-
-/* Finds the location of a specific entry */
-static guint 
-get_location (IndicatorObject * io, IndicatorObjectEntry * entry)
-{
-	g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), 0);
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io);
-	return g_list_index(priv->applications, entry);
-}
-
-/* Searching for ApplicationEntries where the dbusobject and
-   address are the same. */
-static gint
-application_added_search (gconstpointer a, gconstpointer b)
-{
-	ApplicationEntry * appa = (ApplicationEntry *)a;
-	ApplicationEntry * appb = (ApplicationEntry *)b;
-
-	if (g_strcmp0(appa->dbusaddress, appb->dbusaddress) == 0 &&
-			g_strcmp0(appa->dbusobject, appb->dbusobject) == 0) {
-		return 0;
-	}
-
-	return -1;
-}
-
-/* Does a quick meausre of how big the string is in
-   pixels with a Pango layout */
-static gint
-measure_string (GtkStyle * style, PangoContext * context, const gchar * string)
-{
-	PangoLayout * layout = pango_layout_new(context);
-	pango_layout_set_text(layout, string, -1);
-	pango_layout_set_font_description(layout, style->font_desc);
-
-	gint width;
-	pango_layout_get_pixel_size(layout, &width, NULL);
-	g_object_unref(layout);
-	return width;
-}
-
-/* Try to get a good guess at what a maximum width of the entire
-   string would be. */
-static void
-guess_label_size (ApplicationEntry * app)
-{
-	/* This is during startup. */
-	if (app->entry.label == NULL) return;
-
-	GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(app->entry.label));
-	PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(app->entry.label));
-
-	gint length = measure_string(style, context, gtk_label_get_text(app->entry.label));
-
-	if (app->guide != NULL) {
-		gint guidelen = measure_string(style, context, app->guide);
-		if (guidelen > length) {
-			length = guidelen;
-		}
-	}
-
-	gtk_widget_set_size_request(GTK_WIDGET(app->entry.label), length, -1);
-
-	return;
-}
-
-/* Here we respond to new applications by building up the
-   ApplicationEntry and signaling the indicator host that
-   we've got a new indicator. */
-static void
-application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application)
-{
-	g_return_if_fail(IS_INDICATOR_APPLICATION(application));
-	g_debug("Building new application entry: %s  with icon: %s", dbusaddress, iconname);
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-
-	/* First search to see if we already have this entry */
-	ApplicationEntry searchapp;
-	searchapp.dbusaddress = (gchar *)dbusaddress;  /* Casting off const, but it's okay, we're not changing it */
-	searchapp.dbusobject = (gchar *)dbusobject;    /* Casting off const, but it's okay, we're not changing it */
-
-	GList * searchpointer = g_list_find_custom(priv->applications, &searchapp, application_added_search);
-	if (searchpointer != NULL) {
-		g_debug("\t...Already have that one.");
-		ApplicationEntry * app = (ApplicationEntry *)searchpointer->data;
-		app->old_service = FALSE;
-		return;
-	}
-
-	ApplicationEntry * app = g_new(ApplicationEntry, 1);
-
-	app->old_service = FALSE;
-	app->icon_theme_path = NULL;
-	if (icon_theme_path != NULL && icon_theme_path[0] != '\0') {
-		app->icon_theme_path = g_strdup(icon_theme_path);
-		theme_dir_ref(application, icon_theme_path);
-	}
-
-	app->dbusaddress = g_strdup(dbusaddress);
-	app->dbusobject = g_strdup(dbusobject);
-	app->guide = NULL;
-
-	/* We make a long name using the suffix, and if that
-	   icon is available we want to use it.  Otherwise we'll
-	   just use the name we were given. */
-	app->longname = NULL;
-	if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) {
-		app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
-	} else {
-		app->longname = g_strdup(iconname);
-	}
-	app->entry.image = indicator_image_helper(app->longname);
-
-	if (label == NULL || label[0] == '\0') {
-		app->entry.label = NULL;
-	} else {
-		app->entry.label = GTK_LABEL(gtk_label_new(label));
-		g_object_ref(G_OBJECT(app->entry.label));
-		gtk_widget_show(GTK_WIDGET(app->entry.label));
-
-		if (app->guide != NULL) {
-			g_free(app->guide);
-			app->guide = NULL;
-		}
-
-		if (guide != NULL) {
-			app->guide = g_strdup(guide);
-		}
-
-		guess_label_size(app);
-	}
-
-	app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject));
-
-	/* Keep copies of these for ourself, just in case. */
-	g_object_ref(app->entry.image);
-	g_object_ref(app->entry.menu);
-
-	gtk_widget_show(GTK_WIDGET(app->entry.image));
-
-	priv->applications = g_list_insert(priv->applications, app, position);
-
-	g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE);
-	return;
-}
-
-/* This removes the application from the list and free's all
-   of the memory associated with it. */
-static void
-application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * application)
-{
-	g_return_if_fail(IS_INDICATOR_APPLICATION(application));
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-	ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
-
-	if (app == NULL) {
-		g_warning("Unable to find application at position: %d", position);
-		return;
-	}
-
-	priv->applications = g_list_remove(priv->applications, app);
-	g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE);
-
-	if (app->icon_theme_path != NULL) {
-		theme_dir_unref(application, app->icon_theme_path);
-		g_free(app->icon_theme_path);
-	}
-	if (app->dbusaddress != NULL) {
-		g_free(app->dbusaddress);
-	}
-	if (app->dbusobject != NULL) {
-		g_free(app->dbusobject);
-	}
-	if (app->guide != NULL) {
-		g_free(app->guide);
-	}
-	if (app->longname != NULL) {
-		g_free(app->longname);
-	}
-	if (app->entry.image != NULL) {
-		g_object_unref(G_OBJECT(app->entry.image));
-	}
-	if (app->entry.label != NULL) {
-		g_object_unref(G_OBJECT(app->entry.label));
-	}
-	if (app->entry.menu != NULL) {
-		g_object_unref(G_OBJECT(app->entry.menu));
-	}
-	g_free(app);
-
-	return;
-}
-
-/* The callback for the signal that the label for an application
-   has changed. */
-static void
-application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-	ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
-	gboolean signal_reload = FALSE;
-
-	if (app == NULL) {
-		g_warning("Unable to find application at position: %d", position);
-		return;
-	}
-	
-	if (label == NULL || label[0] == '\0') {
-		/* No label, let's see if we need to delete the old one */
-		if (app->entry.label != NULL) {
-			g_object_unref(G_OBJECT(app->entry.label));
-			app->entry.label = NULL;
-
-			signal_reload = TRUE;
-		}
-	} else {
-		/* We've got a label, is this just an update or is
-		   it a new thing. */
-		if (app->entry.label != NULL) {
-			gtk_label_set_text(app->entry.label, label);
-		} else {
-			app->entry.label = GTK_LABEL(gtk_label_new(label));
-			g_object_ref(G_OBJECT(app->entry.label));
-			gtk_widget_show(GTK_WIDGET(app->entry.label));
-
-			signal_reload = TRUE;
-		}
-	}
-
-	/* Copy the guide if we have one */
-	if (app->guide != NULL) {
-		g_free(app->guide);
-		app->guide = NULL;
-	}
-
-	if (guide != NULL && guide[0] != '\0') {
-		app->guide = g_strdup(guide);
-	}
-
-	/* Protected against not having a label */
-	guess_label_size(app);
-
-	if (signal_reload) {
-		/* Telling the listener that this has been removed, and then
-		   readded to make it reparse the entry. */
-		if (app->entry.label != NULL) {
-			gtk_widget_hide(GTK_WIDGET(app->entry.label));
-		}
-
-		if (app->entry.image != NULL) {
-			gtk_widget_hide(GTK_WIDGET(app->entry.image));
-		}
-
-		if (app->entry.menu != NULL) {
-			gtk_menu_detach(app->entry.menu);
-		}
-
-		g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE);
-
-		if (app->entry.label != NULL) {
-			gtk_widget_show(GTK_WIDGET(app->entry.label));
-		}
-
-		if (app->entry.image != NULL) {
-			indicator_image_helper_update(app->entry.image, app->longname);
-			gtk_widget_show(GTK_WIDGET(app->entry.image));
-		}
-
-		g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE);
-	}
-
-	return;
-}
-
-/* The callback for the signal that the icon for an application
-   has changed. */
-static void
-application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-	ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
-
-	if (app == NULL) {
-		g_warning("Unable to find application at position: %d", position);
-		return;
-	}
-
-	/* We make a long name using the suffix, and if that
-	   icon is available we want to use it.  Otherwise we'll
-	   just use the name we were given. */
-	if (app->longname != NULL) {
-		g_free(app->longname);
-		app->longname = NULL;
-	}
-	if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) {
-		app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
-	} else {
-		app->longname = g_strdup(iconname);
-	}
-	indicator_image_helper_update(app->entry.image, app->longname);
-
-	return;
-}
-
-/* The callback for the signal that the icon theme path for an application
-   has changed. */
-static void
-application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
-	ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
-
-	if (app == NULL) {
-		g_warning("Unable to find application at position: %d", position);
-		return;
-	}
-
-	if (g_strcmp0(icon_theme_path, app->icon_theme_path) != 0) {
-	    if(app->icon_theme_path != NULL) {
-	        theme_dir_unref(application, app->icon_theme_path);
-	        g_free(app->icon_theme_path);
-            app->icon_theme_path = NULL;
-        }
-        if (icon_theme_path != NULL && icon_theme_path[0] != '\0') {
-		    app->icon_theme_path = g_strdup(icon_theme_path);
-		    theme_dir_ref(application, app->icon_theme_path);
-	    }
-	   indicator_image_helper_update(app->entry.image, app->longname);
-	}
-
-	return;
-}
-
-/* This repsonds to the list of applications that the service
-   has and calls application_added on each one of them. */
-static void
-get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata)
-{
-	if (error != NULL) {
-		g_warning("Unable to get application list: %s", error->message);
-		return;
-	}
-	g_ptr_array_foreach(OUT_applications, get_applications_helper, userdata);
-
-	return;
-}
-
-/* A little helper that takes apart the DBus structure and calls
-   application_added on every entry in the list. */
-static void
-get_applications_helper (gpointer data, gpointer user_data)
-{
-	GValueArray * array = (GValueArray *)data;
-
-	g_return_if_fail(array->n_values == 7);
-
-	const gchar * icon_name = g_value_get_string(g_value_array_get_nth(array, 0));
-	gint position = g_value_get_int(g_value_array_get_nth(array, 1));
-	const gchar * dbus_address = g_value_get_string(g_value_array_get_nth(array, 2));
-	const gchar * dbus_object = g_value_get_boxed(g_value_array_get_nth(array, 3));
-	const gchar * icon_theme_path = g_value_get_string(g_value_array_get_nth(array, 4));
-	const gchar * label = g_value_get_string(g_value_array_get_nth(array, 5));
-	const gchar * guide = g_value_get_string(g_value_array_get_nth(array, 6));
-
-	return application_added(NULL, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, user_data);
-}
-
-/* Unrefs a theme directory.  This may involve removing it from
-   the search path. */
-static void
-theme_dir_unref(IndicatorApplication * ia, const gchar * dir)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia);
-
-	/* Grab the count for this dir */
-	int count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir));
-
-	/* Is this a simple deprecation, if so, we can just lower the
-	   number and move on. */
-	if (count > 1) {
-		count--;
-		g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count));
-		return;
-	}
-
-	/* Try to remove it from the hash table, this makes sure
-	   that it existed */
-	if (!g_hash_table_remove(priv->theme_dirs, dir)) {
-		g_warning("Unref'd a directory that wasn't in the theme dir hash table.");
-		return;
-	}
-
-	GtkIconTheme * icon_theme = gtk_icon_theme_get_default();
-	gchar ** paths;
-	gint path_count;
-
-	gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
-
-	gint i;
-	gboolean found = FALSE;
-	for (i = 0; i < path_count; i++) {
-		if (found) {
-			/* If we've already found the right entry */
-			paths[i - 1] = paths[i];
-		} else {
-			/* We're still looking, is this the one? */
-			if (!g_strcmp0(paths[i], dir)) {
-				found = TRUE;
-				/* We're freeing this here as it won't be captured by the
-				   g_strfreev() below as it's out of the array. */
-				g_free(paths[i]);
-			}
-		}
-	}
-	
-	/* If we found one we need to reset the path to
-	   accomidate the changes */
-	if (found) {
-		paths[path_count - 1] = NULL; /* Clear the last one */
-		gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, path_count - 1);
-	}
-
-	g_strfreev(paths);
-
-	return;
-}
-
-/* Refs a theme directory, and it may add it to the search
-   path */
-static void
-theme_dir_ref(IndicatorApplication * ia, const gchar * dir)
-{
-	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia);
-
-	int count = 0;
-	if ((count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir))) != 0) {
-		/* It exists so what we need to do is increase the ref
-		   count of this dir. */
-		count++;
-	} else {
-		/* It doesn't exist, so we need to add it to the table
-		   and to the search path. */
-		gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), dir);
-		g_debug("\tAppending search path: %s", dir);
-		count = 1;
-	}
-
-	g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count));
-
-	return;
-}
-