Releasing 1.19.5

[sojka/lightdm.git] / src / shared-data-manager.c

diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
index 5b6676470ebda2e2f3b962c4184e9c2ad76aea72..fd7427e375b899f2ec1e79947619ed10e963e0cb 100644 (file)
--- a/src/shared-data-manager.c
+++ b/src/shared-data-manager.c
@@ -49,11 +49,7 @@ shared_data_manager_get_instance (void)
 void
 shared_data_manager_cleanup (void)
 {
-    if (singleton)
-    {
-        g_object_unref (singleton);
-        singleton = NULL;
-    }
+    g_clear_object (&singleton);
 }
 
 static void
@@ -227,7 +223,7 @@ shared_data_manager_start (SharedDataManager *manager)
     g_object_unref (file);
 
     /* And listen for user removals. */
-    g_signal_connect (common_user_list_get_instance (), "user-removed", G_CALLBACK (user_removed_cb), manager);
+    g_signal_connect (common_user_list_get_instance (), USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (user_removed_cb), manager);
 }
 
 static void
@@ -245,22 +241,14 @@ shared_data_manager_init (SharedDataManager *manager)
 }
 
 static void
-shared_data_manager_dispose (GObject *object)
+shared_data_manager_finalize (GObject *object)
 {
     SharedDataManager *self = SHARED_DATA_MANAGER (object);
-
+  
     /* Should also cancel outstanding GIO operations, but whatever, let them do their thing. */
 
     g_signal_handlers_disconnect_by_data (common_user_list_get_instance (), self);
 
-    G_OBJECT_CLASS (shared_data_manager_parent_class)->dispose (object);
-}
-
-static void
-shared_data_manager_finalize (GObject *object)
-{
-    SharedDataManager *self = SHARED_DATA_MANAGER (object);
-
     if (self->priv->starting_dirs)
         g_hash_table_destroy (self->priv->starting_dirs);
 
@@ -274,7 +262,6 @@ shared_data_manager_class_init (SharedDataManagerClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    object_class->dispose = shared_data_manager_dispose;
     object_class->finalize = shared_data_manager_finalize;
 
     g_type_class_add_private (klass, sizeof (SharedDataManagerPrivate));