[gdm/wip/wayland-for-merge: 10/20] display: Remove some unnecessary parts from dispose



commit 609770e71bfcfd663ee8a4c13cfeba9e2f5129de
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Feb 25 12:22:51 2014 -0500

    display: Remove some unnecessary parts from dispose
    
    These can't possibly be active and armed if we're disposing.

 daemon/gdm-display.c |   18 ------------------
 1 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 7fafd28..c904a59 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -1246,24 +1246,6 @@ gdm_display_dispose (GObject *object)
         g_assert (display->priv->status == GDM_DISPLAY_FINISHED ||
                   display->priv->status == GDM_DISPLAY_FAILED);
 
-        if (display->priv->slave != NULL) {
-                gdm_slave_stop (display->priv->slave);
-                g_object_unref (display->priv->slave);
-                display->priv->slave = NULL;
-        }
-
-        if (display->priv->user_access_file != NULL) {
-                gdm_display_access_file_close (display->priv->user_access_file);
-                g_object_unref (display->priv->user_access_file);
-                display->priv->user_access_file = NULL;
-        }
-
-        if (display->priv->access_file != NULL) {
-                gdm_display_access_file_close (display->priv->access_file);
-                g_object_unref (display->priv->access_file);
-                display->priv->access_file = NULL;
-        }
-
         G_OBJECT_CLASS (gdm_display_parent_class)->dispose (object);
 }
 


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