[gdm] slave: Don't stop when finalized



commit fd80b4578b40d8a164391f7234c83bedec26f672
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Feb 25 10:41:06 2014 -0500

    slave: Don't stop when finalized
    
    The slave is already stopped by the time it's finalized in all cases,
    and we do a ref/unref inside gdm_slave_stop, which is illegal at
    finalization time.
    
    The net effect is that we end up printing warnings about ref_count > 0
    instead of doing any stopping.

 daemon/gdm-simple-slave.c        |    2 --
 daemon/gdm-slave.c               |    2 --
 daemon/gdm-xdmcp-chooser-slave.c |    2 --
 3 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 86a8328..ca96113 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1761,8 +1761,6 @@ gdm_simple_slave_finalize (GObject *object)
 
         g_return_if_fail (slave->priv != NULL);
 
-        gdm_slave_stop (GDM_SLAVE (slave));
-
         g_hash_table_unref (slave->priv->open_reauthentication_requests);
 
         if (slave->priv->greeter_reset_id > 0) {
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index a592ab0..20b0203 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -1938,8 +1938,6 @@ gdm_slave_finalize (GObject *object)
 
         g_return_if_fail (slave->priv != NULL);
 
-        gdm_slave_real_stop (slave);
-
         g_free (slave->priv->display_id);
         g_free (slave->priv->display_name);
         g_free (slave->priv->display_hostname);
diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c
index 53baf9a..a21898c 100644
--- a/daemon/gdm-xdmcp-chooser-slave.c
+++ b/daemon/gdm-xdmcp-chooser-slave.c
@@ -426,8 +426,6 @@ gdm_xdmcp_chooser_slave_finalize (GObject *object)
 
         g_return_if_fail (xdmcp_chooser_slave->priv != NULL);
 
-        gdm_slave_stop (GDM_SLAVE (xdmcp_chooser_slave));
-
         G_OBJECT_CLASS (gdm_xdmcp_chooser_slave_parent_class)->finalize (object);
 }
 


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