empathy-tp-tube: remove initiator and type member variables as they are not used

[empathy.git] / libempathy / empathy-contact-manager.c

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 315ea2c7afa6ed41734ac7087b8b10a0c2fecf9e..409f41c449625afa215c33015fd9eda341f02216 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -47,6 +47,8 @@ G_DEFINE_TYPE_WITH_CODE (EmpathyContactManager, empathy_contact_manager, G_TYPE_
                         G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
                                                contact_manager_iface_init));
 
+static EmpathyContactManager *manager_singleton = NULL;
+
 static void
 contact_manager_members_changed_cb (EmpathyTpContactList  *list,
                                    EmpathyContact        *contact,
@@ -185,8 +187,35 @@ contact_manager_finalize (GObject *object)
                              contact_manager_disconnect_foreach,
                              object);
        g_hash_table_destroy (priv->lists);
+
+       g_signal_handlers_disconnect_by_func (priv->account_manager,
+                                             contact_manager_connection_changed_cb,
+                                             object);
        g_object_unref (priv->account_manager);
-       g_object_unref (priv->contact_monitor);
+
+       if (priv->contact_monitor) {
+               g_object_unref (priv->contact_monitor);
+       }
+}
+
+static GObject *
+contact_manager_constructor (GType type,
+                            guint n_props,
+                            GObjectConstructParam *props)
+{
+       GObject *retval;
+
+       if (manager_singleton) {
+               retval = g_object_ref (manager_singleton);
+       } else {
+               retval = G_OBJECT_CLASS (empathy_contact_manager_parent_class)->constructor
+                       (type, n_props, props);
+
+               manager_singleton = EMPATHY_CONTACT_MANAGER (retval);
+               g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+       }
+
+       return retval;
 }
 
 static void
@@ -195,6 +224,7 @@ empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
        object_class->finalize = contact_manager_finalize;
+       object_class->constructor = contact_manager_constructor;
 
        g_type_class_add_private (object_class, sizeof (EmpathyContactManagerPriv));
 }
@@ -212,14 +242,14 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
                                             empathy_account_equal,
                                             (GDestroyNotify) g_object_unref,
                                             (GDestroyNotify) g_object_unref);
-       priv->account_manager = empathy_account_manager_new ();
-       priv->contact_monitor = empathy_contact_monitor_new_for_proxy (EMPATHY_CONTACT_LIST (manager));
+       priv->account_manager = empathy_account_manager_dup_singleton ();
+       priv->contact_monitor = NULL;
 
        g_signal_connect (priv->account_manager,
                          "account-connection-changed",
                          G_CALLBACK (contact_manager_connection_changed_cb), manager);
 
-       mc = empathy_mission_control_new ();
+       mc = empathy_mission_control_dup_singleton ();
 
        /* Get ContactList for existing connections */
        accounts = mission_control_get_online_connections (mc, NULL);
@@ -233,18 +263,9 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
 }
 
 EmpathyContactManager *
-empathy_contact_manager_new (void)
+empathy_contact_manager_dup_singleton (void)
 {
-       static EmpathyContactManager *manager = NULL;
-
-       if (!manager) {
-               manager = g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL);
-               g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager);
-       } else {
-               g_object_ref (manager);
-       }
-
-       return manager;
+       return g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL);
 }
 
 EmpathyTpContactList *
@@ -328,6 +349,10 @@ contact_manager_get_monitor (EmpathyContactList *manager)
 {
        EmpathyContactManagerPriv *priv = GET_PRIV (manager);
 
+       if (priv->contact_monitor == NULL) {
+               priv->contact_monitor = empathy_contact_monitor_new_for_iface (manager);
+       }
+
        return priv->contact_monitor;
 }