trying to implement runtime theme-path changing

4 files changed, 113 insertions, 3 deletions

diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 311fcb1..6c11b7f 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -49,6 +49,7 @@ static gboolean _application_service_server_get_applications (ApplicationService
 #define NOTIFICATION_ITEM_SIG_NEW_ICON    "NewIcon"
 #define NOTIFICATION_ITEM_SIG_NEW_AICON   "NewAttentionIcon"
 #define NOTIFICATION_ITEM_SIG_NEW_STATUS  "NewStatus"
+#define NOTIFICATION_ITEM_SIG_NEW_ICON_PATH    "NewIconPath"
 
 /* Private Stuff */
 struct _ApplicationServiceAppstorePrivate {
@@ -89,6 +90,7 @@ enum {
 	APPLICATION_ADDED,
 	APPLICATION_REMOVED,
 	APPLICATION_ICON_CHANGED,
+	APPLICATION_ICON_PATH_CHANGED,
 	LAST_SIGNAL
 };
 
@@ -138,6 +140,13 @@ application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass)
 	                                           NULL, NULL,
 	                                           _application_service_marshal_VOID__INT_STRING,
 	                                           G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE);
+	signals[APPLICATION_ICON_PATH_CHANGED] = g_signal_new ("application-icon-path-changed",
+	                                           G_TYPE_FROM_CLASS(klass),
+	                                           G_SIGNAL_RUN_LAST,
+	                                           G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_path_changed),
+	                                           NULL, NULL,
+	                                           _application_service_marshal_VOID__INT_STRING,
+	                                           G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE);
 
 	dbus_g_object_type_install_info(APPLICATION_SERVICE_APPSTORE_TYPE,
 	                                &dbus_glib__application_service_server_object_info);
@@ -540,6 +549,44 @@ new_aicon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdat
 	return;
 }
 
+/* Gets the data back on an updated icon signal.  Hopefully
+   a new fun icon. */
+static void
+new_path_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata)
+{
+	/* Check for errors */
+	if (error != NULL) {
+		g_warning("Unable to get updated icon name: %s", error->message);
+		return;
+	}
+
+	/* Grab the icon and make sure we have one */
+	const gchar * newpath = g_value_get_string(&value);
+	if (newpath == NULL) {
+		g_warning("Bad new path :(");
+		return;
+	}
+
+	Application * app = (Application *) userdata;
+
+	if (g_strcmp0(newpath, app->icon_path)) {
+		/* If the new path is actually a new path */
+		if (app->icon_path != NULL) g_free(app->icon_path);
+		app->icon_path = g_strdup(newpath);
+
+		if (app->status == APP_INDICATOR_STATUS_ACTIVE) {
+			gint position = get_position(app);
+			if (position == -1) return;
+
+			g_signal_emit(G_OBJECT(app->appstore),
+			              signals[APPLICATION_ICON_PATH_CHANGED], 0, 
+			              position, newpath, TRUE);
+		}
+	}
+
+	return;
+}
+
 /* Called when the Notification Item signals that it
    has a new icon. */
 static void
@@ -586,6 +633,22 @@ new_status (DBusGProxy * proxy, const gchar * status, gpointer data)
 	return;
 }
 
+/* Called when the Notification Item signals that it
+   has a new icon. */
+static void
+new_path (DBusGProxy * proxy, gpointer data)
+{
+	Application * app = (Application *)data;
+	if (!app->validated) return;
+
+	org_freedesktop_DBus_Properties_get_async(app->prop_proxy,
+	                                          NOTIFICATION_ITEM_DBUS_IFACE,
+	                                          NOTIFICATION_ITEM_PROP_ICON_PATH,
+	                                          new_path_cb,
+	                                          app);
+	return;
+}
+
 /* Adding a new NotificationItem object from DBus in to the
    appstore.  First, we need to get the information on it
    though. */
@@ -659,7 +722,10 @@ application_service_appstore_application_add (ApplicationServiceAppstore * appst
 	                        NOTIFICATION_ITEM_SIG_NEW_STATUS,
 	                        G_TYPE_STRING,
 	                        G_TYPE_INVALID);
-
+    dbus_g_proxy_add_signal(app->dbus_proxy,
+	                        NOTIFICATION_ITEM_SIG_NEW_ICON_PATH,
+	                        G_TYPE_INVALID);
+	
 	dbus_g_proxy_connect_signal(app->dbus_proxy,
 	                            NOTIFICATION_ITEM_SIG_NEW_ICON,
 	                            G_CALLBACK(new_icon),
@@ -675,7 +741,12 @@ application_service_appstore_application_add (ApplicationServiceAppstore * appst
 	                            G_CALLBACK(new_status),
 	                            app,
 	                            NULL);
-
+    dbus_g_proxy_connect_signal(app->dbus_proxy,
+	                            NOTIFICATION_ITEM_SIG_NEW_ICON_PATH,
+	                            G_CALLBACK(new_path),
+	                            app,
+	                            NULL);
+	
 	/* Get all the propertiees */
 	org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy,
 	                                              NOTIFICATION_ITEM_DBUS_IFACE,
diff --git a/src/application-service-appstore.h b/src/application-service-appstore.h
index e8ba8c1..066dfbc 100644
--- a/src/application-service-appstore.h
+++ b/src/application-service-appstore.h
@@ -45,7 +45,8 @@ struct _ApplicationServiceAppstoreClass {
 
 	void (*application_added) (ApplicationServiceAppstore * appstore, gchar *, gint, gchar *, gchar *, gpointer);
 	void (*application_removed) (ApplicationServiceAppstore * appstore, gint, gpointer);
-	void (*application_icon_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer);
+	void (*application_icon_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer);	
+    void (*application_icon_path_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer);
 };
 
 struct _ApplicationServiceAppstore {
diff --git a/src/application-service.xml b/src/application-service.xml
index 0b2e959..9a559d2 100644
--- a/src/application-service.xml
+++ b/src/application-service.xml
@@ -44,6 +44,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<arg type="i" name="position" direction="out" />
 			<arg type="s" name="icon_name" direction="out" />
 		</signal>
+		<signal name="ApplicationIconPathChanged">
+			<arg type="i" name="position" direction="out" />
+			<arg type="s" name="icon_path" direction="out" />
+		</signal>
 
 	</interface>
 </node>
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 16c3a9f..66913df 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -108,6 +108,7 @@ 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_path, IndicatorApplication * application);
 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 application_icon_path_changed (DBusGProxy * proxy, gint position, const gchar * iconpath, 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);
@@ -280,6 +281,11 @@ connected (IndicatorApplication * application)
 	                        	G_TYPE_INT,
 	                        	G_TYPE_STRING,
 	                        	G_TYPE_INVALID);
+		dbus_g_proxy_add_signal(priv->service_proxy,
+	                        	"ApplicationIconPathChanged",
+	                        	G_TYPE_INT,
+	                        	G_TYPE_STRING,
+	                        	G_TYPE_INVALID);
 
 		/* Connect to them */
 		g_debug("Connect to them.");
@@ -298,6 +304,11 @@ connected (IndicatorApplication * application)
 	                            	G_CALLBACK(application_icon_changed),
 	                            	application,
 	                            	NULL /* Disconnection Signal */);
+		dbus_g_proxy_connect_signal(priv->service_proxy,
+	                            	"ApplicationIconPathChanged",
+	                            	G_CALLBACK(application_icon_path_changed),
+	                            	application,
+	                            	NULL /* Disconnection Signal */);
 	}
 
 	/* Query it for existing applications */
@@ -537,6 +548,29 @@ application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconn
 	return;
 }
 
+/* The callback for the signal that the icon path for an application
+   has changed. */
+static void
+application_icon_path_changed (DBusGProxy * proxy, gint position, const gchar * iconpath, 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;
+	}
+
+    g_free(app->icon_path);
+	app->icon_path = NULL;
+	if (iconpath != NULL && iconpath[0] != '\0') {
+		app->icon_path = g_strdup(iconpath);
+		theme_dir_ref(application, iconpath);
+	}
+
+	return;
+}
+
 /* This repsonds to the list of applications that the service
    has and calls application_added on each one of them. */
 static void