summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2013-05-21 15:03:46 -0400
committerRay Strode <rstrode@redhat.com>2013-05-21 15:03:46 -0400
commita39328020930293076391ba7f261c3779e6f96c7 (patch)
tree09333427d93de4e2a2e751760cc0a18e5e040d00 /daemon
parenta019c171ec89e3a81388073b78e6c60a4702a59d (diff)
downloadgdm-a39328020930293076391ba7f261c3779e6f96c7.tar.gz
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.
Diffstat (limited to 'daemon')
-rw-r--r--daemon/gdm-manager.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index ce857cf8..6f5364e7 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);