[empathy] Rename empathy_location_manager_get_default to dup_default



commit 2556a450e8c1c1deb5330dacb00087e6c56d8f57
Author: Pierre-Luc Beaudoin <pierre-luc beaudoin collabora co uk>
Date:   Thu May 28 17:03:35 2009 -0400

    Rename empathy_location_manager_get_default to dup_default
    
    This is more consistent with the rest of Empathy.
---
 libempathy-gtk/empathy-location-manager.c |   10 +++++++---
 libempathy-gtk/empathy-location-manager.h |    2 +-
 src/empathy.c                             |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 90478ff..27eca75 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -275,12 +275,16 @@ location_manager_set_property (GObject *object,
 
 
 EmpathyLocationManager *
-empathy_location_manager_get_default (void)
+empathy_location_manager_dup_default (void)
 {
   static EmpathyLocationManager *singleton = NULL;
   if (singleton == NULL)
-    singleton = g_object_new (EMPATHY_TYPE_LOCATION_MANAGER, NULL);
-  return singleton;
+    {
+      singleton = g_object_new (EMPATHY_TYPE_LOCATION_MANAGER, NULL);
+      g_object_add_weak_pointer (G_OBJECT (singleton), (gpointer *)&singleton);
+    }
+
+  return g_object_ref (singleton);
 }
 
 static void
diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h
index 9315c46..fbe2b06 100644
--- a/libempathy-gtk/empathy-location-manager.h
+++ b/libempathy-gtk/empathy-location-manager.h
@@ -50,7 +50,7 @@ struct _EmpathyLocationManagerClass
 };
 
 GType empathy_location_manager_get_type (void) G_GNUC_CONST;
-EmpathyLocationManager * empathy_location_manager_get_default (void);
+EmpathyLocationManager * empathy_location_manager_dup_default (void);
 
 G_END_DECLS
 
diff --git a/src/empathy.c b/src/empathy.c
index 60c2508..617543a 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -588,7 +588,7 @@ main (int argc, char *argv[])
 
 	/* Location mananger */
 #if HAVE_GEOCLUE
-	location_manager = empathy_location_manager_get_default ();
+	location_manager = empathy_location_manager_dup_default ();
 #endif
 
 	gtk_main ();



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