Merge lp:~larsu/indicator-messages/listen-to-app-stopped-running into lp:indicator-messages/14.04

[Lars Karlitski]

messages-service: listen to the ApplicationStoppedRunning call

Prior to this patch, only applications that exit were marked as "not running". However, this must also happen when an application unrefs it's MessagingMenuApp instance. This is a problem for applications which implement messaging menu integration as a plugin (when unloading the plugin).

Specifically, this causes bug #1302930, as telepathy-indicator doesn't exit when empathy exits.

messages-service: listen to the ApplicationStoppedRunning call

Prior to this patch, only applications that exit were marked as "not running". However, this must also happen when an application unrefs it's MessagingMenuApp instance. This is a problem for applications which implement messaging menu integration as a plugin (when unloading the plugin).

Specifically, this causes bug #1302930, as telepathy-indicator doesn't exit when empathy exits.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:410
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-messages-ci/119/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2014-04-07 10:00:10 +0000
+++ src/im-application-list.c	2014-04-10 08:27:23 +0000
@@ -1158,6 +1158,12 @@
       return;
     }
 
+  if (!connection && !unique_bus_name && !object_path)
+    {
+      im_application_list_unset_remote (app);
+      return;
+    }
+
   if (app->cancellable)
     {
       gchar *name_owner = NULL;

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2013-10-04 09:22:00 +0000
+++ src/messages-service.c	2014-04-10 08:27:23 +0000
@@ -123,6 +123,28 @@
 	return TRUE;
 }
 
+static gboolean
+app_stopped (IndicatorMessagesService *service,
+	     GDBusMethodInvocation *invocation,
+	     const gchar *desktop_id,
+	     gpointer user_data)
+{
+	GDesktopAppInfo *appinfo;
+	const gchar *id;
+
+	appinfo = g_desktop_app_info_new (desktop_id);
+	if (!appinfo)
+		return TRUE;
+
+	id = g_app_info_get_id (G_APP_INFO (appinfo));
+	im_application_list_set_remote (applications, id, NULL, NULL, NULL);
+	indicator_messages_service_complete_application_stopped_running (service, invocation);
+
+	g_object_unref (appinfo);
+
+	return TRUE;
+}
+
 /* The status has been set by the user, let's tell the world! */
 static void
 status_set_by_user (ImApplicationList * list, const gchar * status, gpointer user_data)
@@ -231,6 +253,8 @@
 			  G_CALLBACK (unregister_application), NULL);
 	g_signal_connect (messages_service, "handle-set-status",
 			  G_CALLBACK (set_status), NULL);
+	g_signal_connect (messages_service, "handle-application-stopped-running",
+			  G_CALLBACK (app_stopped), NULL);
 
 	applications = im_application_list_new ();
 	g_signal_connect (applications, "status-set",