Merge lp:~indicator-applet-developers/hud/simplify-app-source-refcounting into lp:hud/13.10

[Pete Woods]

Fix the ref counting of application sources

The application sources are now entirely owned by the application-list's hash table

Fix the ref counting of application sources

The application sources are now entirely owned by the application-list's hash table

[lp:~indicator-applet-developers/hud/simplify-app-source-refcounting]

338. By Pete Woods on 2013-10-14

Fix a missing clear

[Antti Kaijanmäki (kaijanmaki)]

approved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/hud-ci/149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/111/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/41
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/110/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/hud-ci/149/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/application-list.c'
--- src/application-list.c	2013-10-11 15:58:52 +0000
+++ src/application-list.c	2013-10-14 15:48:19 +0000
@@ -229,11 +229,9 @@
 
 	if (self->priv->used_source != NULL) {
 		hud_source_unuse(self->priv->used_source);
-		g_clear_object(&self->priv->used_source);
+		self->priv->used_source = NULL;
 	}
 
-	g_clear_object(&self->priv->last_focused_main_stage_source);
-
 	if (self->priv->matcher_app_sig != 0 && self->priv->window_stack != NULL) {
 		g_signal_handler_disconnect(self->priv->window_stack, self->priv->matcher_app_sig);
 	}
@@ -353,7 +351,7 @@
 	}
 
 	/* Clear the last source, as we've obviously changed */
-	g_clear_object(&list->priv->last_focused_main_stage_source);
+	list->priv->last_focused_main_stage_source = NULL;
 
 	HudApplicationSource *source = application_info_to_source(list, window);
 
@@ -383,7 +381,7 @@
 		return;
 	}
 
-	list->priv->last_focused_main_stage_source = g_object_ref(source);
+	list->priv->last_focused_main_stage_source = source;
 
 	hud_application_source_focus(source, window, window);
 
@@ -399,6 +397,7 @@
 static void
 view_opened (DBusWindowStack * window_stack, guint window_id, const gchar *app_id, gpointer user_data)
 {
+	g_debug("view_opened(%d, %s)", window_id, app_id);
 	HudApplicationList * list = HUD_APPLICATION_LIST(user_data);
 
 	HudWindowInfo *window = hud_window_info_new(list->priv->window_stack,
@@ -421,44 +420,37 @@
 static void
 view_closed (DBusWindowStack * window_stack, guint window_id, const gchar *app_id, gpointer user_data)
 {
-	g_debug("Closing Window: %d", window_id);
+	g_debug("view_closed(%d, %s)", window_id, app_id);
 
 	HudApplicationList * list = HUD_APPLICATION_LIST(user_data);
-
-	GList * sources = g_hash_table_get_values(list->priv->applications);
-	GList * lsource = NULL;
-
-	for (lsource = sources; lsource != NULL; lsource = g_list_next(lsource)) {
-		HudApplicationSource * appsource = HUD_APPLICATION_SOURCE(lsource->data);
-		if (appsource == NULL) continue;
-
-		if (hud_application_source_has_xid(appsource, window_id)) {
-			hud_application_source_window_closed(appsource, window_id);
-		}
-
-		/* If the application source has become empty it means that it
-				 * the correspongind app has terminated and it's time to do the
-				 * cleanup.
-				 */
-		if (hud_application_source_is_empty (appsource)) {
-			if ((gpointer)appsource == (gpointer)list->priv->used_source) {
-				hud_source_unuse(HUD_SOURCE(appsource));
-				g_clear_object(&list->priv->used_source);
-			}
-
-			gchar * id = g_strdup(hud_application_source_get_id(appsource));
-
-			g_debug("Removing application %s", id);
-			g_hash_table_remove(list->priv->applications, id);
-			g_free(id);
-		}
-
-		hud_source_changed(HUD_SOURCE(list));
-	}
-
-
-
-	return;
+	HudSource *source = source_get(HUD_SOURCE(user_data), app_id);
+
+	if (source == NULL) {
+		g_warning("Window closed for unknown app: %s", app_id);
+		return;
+	}
+
+	HudApplicationSource *appsource = HUD_APPLICATION_SOURCE(source);
+
+	if (hud_application_source_has_xid(appsource, window_id)) {
+		hud_application_source_window_closed(appsource, window_id);
+	}
+
+	/* If the application source has become empty it means that
+	 * the corresponding app has terminated and it's time to do the
+	 * cleanup.
+	 */
+	if (hud_application_source_is_empty (appsource)) {
+		if ((gpointer)appsource == (gpointer)list->priv->used_source) {
+			hud_source_unuse(HUD_SOURCE(appsource));
+			list->priv->used_source = NULL;
+		}
+
+		g_debug("Removing application %s", app_id);
+		g_hash_table_remove(list->priv->applications, app_id);
+	}
+
+	hud_source_changed(HUD_SOURCE(list));
 }
 
 /* Source interface using this source */
@@ -480,10 +472,9 @@
 
 	if (list->priv->used_source != NULL) {
 		hud_source_unuse(list->priv->used_source);
-		g_clear_object(&list->priv->used_source);
 	}
 
-	list->priv->used_source = g_object_ref(source);
+	list->priv->used_source = HUD_SOURCE(source);
 
 	hud_source_use(HUD_SOURCE(source));
 
@@ -500,7 +491,7 @@
 	g_return_if_fail(list->priv->used_source != NULL);
 
 	hud_source_unuse(list->priv->used_source);
-	g_clear_object(&list->priv->used_source);
+	list->priv->used_source = NULL;
 
 	return;
 }

=== modified file 'src/application-source.c'
--- src/application-source.c	2013-10-09 13:24:58 +0000
+++ src/application-source.c	2013-10-14 15:48:19 +0000
@@ -166,6 +166,8 @@
 {
 	HudApplicationSource * self = HUD_APPLICATION_SOURCE(object);
 
+	g_debug("hud_application_source_dispose %s", self->priv->app_id);
+
 	if (self->priv->skel != NULL) {
 		g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(self->priv->skel));
 		g_clear_object(&self->priv->skel);
@@ -418,6 +420,8 @@
 HudApplicationSource *
 hud_application_source_new_for_id (const gchar * id)
 {
+	g_debug("hud_application_source_new_for_id: %s", id);
+
 	HudApplicationSource * source = g_object_new(HUD_TYPE_APPLICATION_SOURCE, NULL);
 
 	source->priv->app_id = g_strdup(id);
@@ -521,7 +525,6 @@
 	connection_watcher_t * watcher = g_hash_table_lookup(app->priv->connections, sender);
 	if (watcher == NULL) {
 		watcher = g_new0(connection_watcher_t, 1);
-		g_object_ref(app);
 		watcher->watch = g_bus_watch_name_on_connection(session, sender, G_BUS_NAME_WATCHER_FLAGS_NONE, NULL, connection_lost, app, NULL);
 		g_hash_table_insert(app->priv->connections, g_strdup(sender), watcher);
 	}