Rename empathy_location_manager_get_default to dup_default

This is more consistent with the rest of Empathy.

diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 90478ff36136176401955e5552c493323a2cd174..27eca756ab6ee2e58e118600300aa88552e96946 100644 (file)
--- 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 9315c46460a9e2de70313ff0f31fad74f9350971..fbe2b0667fe3917db08af9b1234ce9e449d8bb66 100644 (file)
--- 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 60c2508380a39dba32cc5baf34782bc1c78e4bed..617543a55d423ecf8656966f095c8af9d558a25f 100644 (file)
--- 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 ();