1 files changed, 103 insertions, 2 deletions

diff --git a/src/indicator-application.c b/src/indicator-application.c
index 8e88f8e..d697d96 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -75,6 +75,7 @@ struct _IndicatorApplicationPrivate {
 	DBusGConnection * bus;
 	DBusGProxy * service_proxy;
 	GList * applications;
+	GHashTable * theme_dirs;
 };
 
 typedef struct _ApplicationEntry ApplicationEntry;
@@ -96,6 +97,8 @@ static void application_added (DBusGProxy * proxy, const gchar * iconname, gint
 static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application);
 static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application);
 static void get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata);
+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);
 
@@ -138,12 +141,15 @@ indicator_application_init (IndicatorApplication *self)
 	/* These are built in the connection phase */
 	priv->bus = NULL;
 	priv->service_proxy = NULL;
+	priv->theme_dirs = NULL;
 
 	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(connected), self);
 
 	priv->applications = NULL;
 
+	priv->theme_dirs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
 	return;
 }
 
@@ -173,6 +179,15 @@ indicator_application_dispose (GObject *object)
 		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;
 }
@@ -295,8 +310,7 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co
 	app->icon_path = NULL;
 	if (icon_path != NULL && icon_path[0] != '\0') {
 		app->icon_path = g_strdup(icon_path);
-		g_debug("\tAppending search path: %s", app->icon_path);
-		gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), app->icon_path);
+		theme_dir_ref(application, icon_path);
 	}
 
 	app->entry.image = GTK_IMAGE(gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU));
@@ -375,3 +389,90 @@ get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error,
 
 	return;
 }
+
+/* Refs a theme directory, and it may add it to 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++) {
+		g_debug("Looking at path dir: '%s'", paths[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;
+}
+
+/* Unrefs a theme directory.  This may involve removing it from
+   the search path. */
+static void
+theme_dir_ref(IndicatorApplication * ia, const gchar * dir)
+{
+	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia);
+	g_debug("\tAppending search path: %s", dir);
+
+	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);
+		count = 1;
+	}
+
+	g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count));
+
+	return;
+}
+