[telepathy-haze/master] Remove pointless HazeCM singleton

Will Thompson will.thompson at collabora.co.uk
Fri Mar 27 17:42:52 PDT 2009


---
 src/connection-manager.c |   10 ----------
 src/connection-manager.h |    2 --
 src/main.c               |    2 +-
 3 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/src/connection-manager.c b/src/connection-manager.c
index c9fd765..92ccf32 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -520,13 +520,3 @@ haze_connection_manager_init (HazeConnectionManager *self)
 {
     DEBUG ("Initializing (HazeConnectionManager *)%p", self);
 }
-
-HazeConnectionManager *
-haze_connection_manager_get (void) {
-    static HazeConnectionManager *manager = NULL;
-    if (G_UNLIKELY(manager == NULL)) {
-        manager = g_object_new (HAZE_TYPE_CONNECTION_MANAGER, NULL);
-    }
-    g_assert (manager != NULL);
-    return manager;
-}
diff --git a/src/connection-manager.h b/src/connection-manager.h
index 4ed2c1d..4ebf4c7 100644
--- a/src/connection-manager.h
+++ b/src/connection-manager.h
@@ -80,8 +80,6 @@ GType haze_connection_manager_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), HAZE_TYPE_CONNECTION_MANAGER, \
                               HazeConnectionManagerClass))
 
-HazeConnectionManager *haze_connection_manager_get (void);
-
 G_END_DECLS
 
 #endif /* #ifndef __HAZE_CONNECTION_MANAGER_H__*/
diff --git a/src/main.c b/src/main.c
index 1c3136b..69391ea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -226,7 +226,7 @@ get_cm (void)
     fatal_mask &= ~G_LOG_LEVEL_CRITICAL;
     g_log_set_always_fatal (fatal_mask);
 
-    return (TpBaseConnectionManager *) haze_connection_manager_get ();
+    return (TpBaseConnectionManager *) g_object_new (HAZE_TYPE_CONNECTION_MANAGER, NULL);
 }
 
 static gboolean
-- 
1.5.6.5




More information about the telepathy-commits mailing list