From 95c3796d6af8017d5b789938dc7518fd6576a65e Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 30 Jun 2011 09:47:40 +0100 Subject: [PATCH] GApplication: unregister action interface export We missed a few cases of unexporting the action group interface (in error cases, and on GApplication teardown). --- gio/gapplicationimpl-dbus.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index 8a19b0d..08db713 100644 --- a/gio/gapplicationimpl-dbus.c +++ b/gio/gapplicationimpl-dbus.c @@ -407,6 +407,9 @@ g_application_impl_destroy (GApplicationImpl *impl) if (impl->object_id) g_dbus_connection_unregister_object (impl->session_bus, impl->object_id); + if (impl->action_id) + g_dbus_connection_unregister_object (impl->session_bus, + impl->action_id); g_dbus_connection_call (impl->session_bus, "org.freedesktop.DBus", @@ -665,6 +668,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; g_object_unref (impl->session_bus); g_free (impl->object_path); -- 2.7.4