[gnome-settings-daemon] automount: Don't really need singletons here



commit 0b260a80a75b3967070533930f0011257af53c39
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Sep 24 00:59:58 2011 +0100

    automount: Don't really need singletons here
    
    It's not like the plugin will get instantiated multiple times, or
    something like that, within gnome-settings-daemon, right?

 plugins/automount/gsd-automount-manager.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c
index c6bb1ed..2fc0f74 100644
--- a/plugins/automount/gsd-automount-manager.c
+++ b/plugins/automount/gsd-automount-manager.c
@@ -56,8 +56,6 @@ static void     gsd_automount_manager_init        (GsdAutomountManager      *gsd
 
 G_DEFINE_TYPE (GsdAutomountManager, gsd_automount_manager, G_TYPE_OBJECT)
 
-static gpointer manager_object = NULL;
-
 static GtkDialog *
 show_error_dialog (const char *primary_text,
 		   const char *secondary_text,
@@ -670,13 +668,5 @@ gsd_automount_manager_init (GsdAutomountManager *manager)
 GsdAutomountManager *
 gsd_automount_manager_new (void)
 {
-        if (manager_object != NULL) {
-                g_object_ref (manager_object);
-        } else {
-                manager_object = g_object_new (GSD_TYPE_AUTOMOUNT_MANAGER, NULL);
-                g_object_add_weak_pointer (manager_object,
-                                           (gpointer *) &manager_object);
-        }
-
-        return GSD_AUTOMOUNT_MANAGER (manager_object);
+        return GSD_AUTOMOUNT_MANAGER (g_object_new (GSD_TYPE_AUTOMOUNT_MANAGER, NULL));
 }



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