Merge lp:~larsu/indicator-messages/dont-unset-remote-for-same-pid into lp:indicator-messages/14.04

[Lars Karlitski]

Protect against processes calling Register() multiple times

Don't unnecessarily reset the application's state if the same process calls Register() more than once.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-messages-ci/106/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2013-10-11 18:53:26 +0000
+++ src/im-application-list.c	2013-10-27 00:51:15 +0000
@@ -1163,9 +1163,12 @@
 
       if (app->proxy)
         name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (app->proxy));
-      g_warning ("replacing '%s' at %s with %s", id, name_owner, unique_bus_name);
 
-      im_application_list_unset_remote (app);
+      if (g_strcmp0 (name_owner, unique_bus_name) != 0)
+        {
+          g_warning ("replacing '%s' at %s with %s", id, name_owner, unique_bus_name);
+          im_application_list_unset_remote (app);
+        }
 
       g_free (name_owner);
     }