diff options
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | src/im-application-list.c | 6 | ||||
| -rw-r--r-- | src/messages-service.c | 24 |
3 files changed, 43 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 082a492..e3d1e97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-messages (13.10.1+14.04.20140410-0ubuntu1) trusty; urgency=low + + [ Lars Uebernickel ] + * 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. (LP: #1302930) + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 10 Apr 2014 12:07:10 +0000 + indicator-messages (13.10.1+14.04.20140408-0ubuntu1) trusty; urgency=low [ Ted Gould ] diff --git a/src/im-application-list.c b/src/im-application-list.c index 4f5903a..7862f1a 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -1158,6 +1158,12 @@ im_application_list_set_remote (ImApplicationList *list, return; } + if (!connection && !unique_bus_name && !object_path) + { + im_application_list_unset_remote (app); + return; + } + if (app->cancellable) { gchar *name_owner = NULL; diff --git a/src/messages-service.c b/src/messages-service.c index 129b082..d1ccbbc 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -123,6 +123,28 @@ set_status (IndicatorMessagesService *service, 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 @@ main (int argc, char ** argv) 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", |