From 3b1d93ed7f7a948d24ecaeb97751083c41841b81 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 15 Jan 2009 20:40:17 +0000 Subject: empathy_mission_control_new -> dup_singleton. svn path=/trunk/; revision=2233 --- libempathy/empathy-account-manager.c | 2 +- libempathy/empathy-contact-manager.c | 2 +- libempathy/empathy-dispatcher.c | 2 +- libempathy/empathy-idle.c | 2 +- libempathy/empathy-tp-contact-factory.c | 2 +- libempathy/empathy-tp-contact-list.c | 2 +- libempathy/empathy-tp-file.c | 2 +- libempathy/empathy-tp-roomlist.c | 4 ++-- libempathy/empathy-tp-tube.c | 2 +- libempathy/empathy-utils.c | 2 +- libempathy/empathy-utils.h | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index b3ccd6de3..26017c97f 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -375,7 +375,7 @@ empathy_account_manager_init (EmpathyAccountManager *manager) EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv); manager->priv = priv; priv->monitor = mc_account_monitor_new (); - priv->mc = empathy_mission_control_new (); + priv->mc = empathy_mission_control_dup_singleton (); priv->connected = priv->connecting = 0; priv->dispose_run = FALSE; diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 533da2aaf..335131a2f 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -249,7 +249,7 @@ empathy_contact_manager_init (EmpathyContactManager *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); diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index c7725f486..b0084ab62 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -926,7 +926,7 @@ empathy_dispatcher_init (EmpathyDispatcher *dispatcher) EMPATHY_TYPE_DISPATCHER, EmpathyDispatcherPriv); dispatcher->priv = priv; - priv->mc = empathy_mission_control_new (); + priv->mc = empathy_mission_control_dup_singleton (); priv->account_manager = empathy_account_manager_dup_singleton (); g_signal_connect (priv->account_manager, diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index faa43c3fe..4a96e2d16 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -424,7 +424,7 @@ empathy_idle_init (EmpathyIdle *idle) idle->priv = priv; priv->is_idle = FALSE; - priv->mc = empathy_mission_control_new (); + priv->mc = empathy_mission_control_dup_singleton (); priv->state = mission_control_get_presence_actual (priv->mc, &error); if (error) { DEBUG ("Error getting actual presence: %s", error->message); diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index 4b16254ee..c407ea49e 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -972,7 +972,7 @@ tp_contact_factory_status_updated (EmpathyTpContactFactory *tp_factory) return; } - mc = empathy_mission_control_new (); + mc = empathy_mission_control_dup_singleton (); priv->connection = mission_control_get_tpconnection (mc, priv->account, NULL); if (!priv->connection) { return; diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 31e7bff0f..ef11587ad 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -711,7 +711,7 @@ tp_contact_list_constructed (GObject *list) const gchar *protocol_name; /* Get the connection. status==0 means CONNECTED */ - mc = empathy_mission_control_new (); + mc = empathy_mission_control_dup_singleton (); status = mission_control_get_connection_status (mc, priv->account, NULL); g_return_if_fail (status == 0); priv->connection = mission_control_get_tpconnection (mc, priv->account, NULL); diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index ccbc856a1..96d8c8887 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -506,7 +506,7 @@ tp_file_constructor (GType type, tp_file = EMPATHY_TP_FILE (file_obj); tp_file->priv->factory = empathy_contact_factory_dup_singleton (); - tp_file->priv->mc = empathy_mission_control_new (); + tp_file->priv->mc = empathy_mission_control_dup_singleton (); g_signal_connect (tp_file->priv->channel, "invalidated", G_CALLBACK (tp_file_invalidated_cb), tp_file); diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c index e73f6cb7a..a1583c083 100644 --- a/libempathy/empathy-tp-roomlist.c +++ b/libempathy/empathy-tp-roomlist.c @@ -279,7 +279,7 @@ tp_roomlist_constructed (GObject *list) EmpathyTpRoomlistPriv *priv = GET_PRIV (list); MissionControl *mc; - mc = empathy_mission_control_new (); + mc = empathy_mission_control_dup_singleton (); priv->account = mission_control_get_account_for_tpconnection (mc, priv->connection, NULL); @@ -401,7 +401,7 @@ empathy_tp_roomlist_new (McAccount *account) g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - mc = empathy_mission_control_new (); + mc = empathy_mission_control_dup_singleton (); connection = mission_control_get_tpconnection (mc, account, NULL); list = g_object_new (EMPATHY_TYPE_TP_ROOMLIST, diff --git a/libempathy/empathy-tp-tube.c b/libempathy/empathy-tp-tube.c index 0772ac271..f8ce0536f 100644 --- a/libempathy/empathy-tp-tube.c +++ b/libempathy/empathy-tp-tube.c @@ -291,7 +291,7 @@ empathy_tp_tube_new_stream_tube (EmpathyContact *contact, g_return_val_if_fail (hostname != NULL, NULL); g_return_val_if_fail (service != NULL, NULL); - mc = empathy_mission_control_new (); + mc = empathy_mission_control_dup_singleton (); account = empathy_contact_get_account (contact); connection = mission_control_get_tpconnection (mc, account, NULL); g_object_unref (mc); diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 4fc12085a..99d89e0eb 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -229,7 +229,7 @@ empathy_account_equal (gconstpointer a, } MissionControl * -empathy_mission_control_new (void) +empathy_mission_control_dup_singleton (void) { static MissionControl *mc = NULL; diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index b51a19614..62cd1a81b 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -68,7 +68,7 @@ xmlNodePtr empathy_xml_node_find_child_prop_value (xmlNodePtr node, guint empathy_account_hash (gconstpointer key); gboolean empathy_account_equal (gconstpointer a, gconstpointer b); -MissionControl *empathy_mission_control_new (void); +MissionControl *empathy_mission_control_dup_singleton (void); const gchar * empathy_presence_get_default_message (McPresence presence); const gchar * empathy_presence_to_str (McPresence presence); McPresence empathy_presence_from_str (const gchar *str); -- cgit v1.2.3