[gdm] manager: clean up manager in dispose not finalize



commit e06ea3c3fdb3c0cc58d689d2323fb29285e7b976
Author: Ray Strode <rstrode redhat com>
Date:   Wed Mar 4 11:12:24 2015 -0500

    manager: clean up manager in dispose not finalize
    
    Seems more appropriate.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745975

 daemon/gdm-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index a47db55..ae42619 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -125,7 +125,7 @@ static guint signals [LAST_SIGNAL] = { 0, };
 
 static void     gdm_manager_class_init  (GdmManagerClass *klass);
 static void     gdm_manager_init        (GdmManager      *manager);
-static void     gdm_manager_finalize    (GObject         *object);
+static void     gdm_manager_dispose     (GObject         *object);
 static void     create_embryonic_user_session_for_display (GdmManager *manager,
                                                            GdmDisplay *display,
                                                            uid_t       allowed_user);
@@ -2599,7 +2599,7 @@ gdm_manager_class_init (GdmManagerClass *klass)
         object_class->get_property = gdm_manager_get_property;
         object_class->set_property = gdm_manager_set_property;
         object_class->constructor = gdm_manager_constructor;
-        object_class->finalize = gdm_manager_finalize;
+        object_class->dispose = gdm_manager_dispose;
 
         signals [DISPLAY_ADDED] =
                 g_signal_new ("display-added",
@@ -2684,7 +2684,7 @@ finish_display (const char *id,
 }
 
 static void
-gdm_manager_finalize (GObject *object)
+gdm_manager_dispose (GObject *object)
 {
         GdmManager *manager;
 
@@ -2731,7 +2731,7 @@ gdm_manager_finalize (GObject *object)
 
         g_object_unref (manager->priv->display_store);
 
-        G_OBJECT_CLASS (gdm_manager_parent_class)->finalize (object);
+        G_OBJECT_CLASS (gdm_manager_parent_class)->dispose (object);
 }
 
 GdmManager *


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