GApplication: fix leaked object path
authorRyan Lortie <desrt@desrt.ca>
Sun, 10 Apr 2011 11:50:26 +0000 (07:50 -0400)
committerRyan Lortie <desrt@desrt.ca>
Sun, 10 Apr 2011 11:50:26 +0000 (07:50 -0400)
In the case that we fail to become the primary instance we should
unregister *both* object paths that we registered during our attempt.

gio/gapplicationimpl-dbus.c

index 406b839..c59c90e 100644 (file)
@@ -659,6 +659,9 @@ g_application_impl_register (GApplication       *application,
       g_dbus_connection_unregister_object (impl->session_bus,
                                            impl->object_id);
       impl->object_id = 0;
+      g_dbus_connection_unregister_object (impl->session_bus,
+                                           impl->action_id);
+      impl->action_id = 0;
 
       if (flags & G_APPLICATION_IS_SERVICE)
         {