[glib/wip/menus-rebase2: 5/64] GApplication: unregister action interface export

[Colin Walters <walters src gnome org>]

commit 3a825a1bdc65cddbb177a068419e57eeb59b646e
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jun 30 09:47:40 2011 +0100

    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 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index 9eeb344..e3271e7 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_object_unref (impl->session_bus);
       g_free (impl->object_path);
@@ -652,6 +655,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);