GApplication: unregister action interface export
authorRyan Lortie <desrt@desrt.ca>
Thu, 30 Jun 2011 08:47:40 +0000 (09:47 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 27 Nov 2011 01:07:24 +0000 (20:07 -0500)
We missed a few cases of unexporting the action group interface (in
error cases, and on GApplication teardown).

gio/gapplicationimpl-dbus.c

index 8a19b0d..08db713 100644 (file)
@@ -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);