From 53389d963d1271d0c36862e2b4866ff5231b9b9e Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Sun, 10 Apr 2011 07:50:26 -0400 Subject: [PATCH] GApplication: fix leaked object path 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index 406b839..c59c90e 100644 --- a/gio/gapplicationimpl-dbus.c +++ b/gio/gapplicationimpl-dbus.c @@ -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) { -- 2.7.4