[gdm] Revert "manager: don't try to unexport objects on system bus after it closes"



commit a39328020930293076391ba7f261c3779e6f96c7
Author: Ray Strode <rstrode redhat com>
Date:   Tue May 21 15:03:46 2013 -0400

    Revert "manager: don't try to unexport objects on system bus after it closes"
    
    This reverts commit fe6dd54d7b5300c1b025a95ed189d4222fd1432f.
    
    It snuck in when I pushed the kerberos change.

 daemon/gdm-manager.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index ce857cf..6f5364e 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -1163,15 +1163,13 @@ gdm_manager_finalize (GObject *object)
                                               G_CALLBACK (on_display_removed),
                                               manager);
 
-        if (!g_dbus_connection_is_closed (manager->priv->connection)) {
-                gdm_display_store_foreach (manager->priv->display_store,
-                                           (GdmDisplayStoreFunc)unexport_display,
-                                           manager);
-                g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (manager));
-        }
-
+        gdm_display_store_foreach (manager->priv->display_store,
+                                   (GdmDisplayStoreFunc)unexport_display,
+                                   manager);
         gdm_display_store_clear (manager->priv->display_store);
 
+        g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (manager));
+
         g_dbus_object_manager_server_set_connection (manager->priv->object_manager, NULL);
 
         g_clear_object (&manager->priv->connection);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]