empathy r2233 - in trunk: libempathy libempathy-gtk megaphone/src src

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Jan 15 20:40:17 2009
New Revision: 2233
URL: http://svn.gnome.org/viewvc/empathy?rev=2233&view=rev

Log:
empathy_mission_control_new -> dup_singleton.

Modified:
   trunk/libempathy-gtk/empathy-account-chooser.c
   trunk/libempathy/empathy-account-manager.c
   trunk/libempathy/empathy-contact-manager.c
   trunk/libempathy/empathy-dispatcher.c
   trunk/libempathy/empathy-idle.c
   trunk/libempathy/empathy-tp-contact-factory.c
   trunk/libempathy/empathy-tp-contact-list.c
   trunk/libempathy/empathy-tp-file.c
   trunk/libempathy/empathy-tp-roomlist.c
   trunk/libempathy/empathy-tp-tube.c
   trunk/libempathy/empathy-utils.c
   trunk/libempathy/empathy-utils.h
   trunk/megaphone/src/megaphone-applet.c
   trunk/src/empathy-accounts-dialog.c
   trunk/src/empathy-main-window.c
   trunk/src/empathy.c

Modified: trunk/libempathy-gtk/empathy-account-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-account-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-account-chooser.c	Thu Jan 15 20:40:17 2009
@@ -649,7 +649,7 @@
 
 	g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE);
 
-	mc = empathy_mission_control_new ();
+	mc = empathy_mission_control_dup_singleton ();
 	status = mission_control_get_connection_status (mc, account, NULL);
 	g_object_unref (mc);
 

Modified: trunk/libempathy/empathy-account-manager.c
==============================================================================
--- trunk/libempathy/empathy-account-manager.c	(original)
+++ trunk/libempathy/empathy-account-manager.c	Thu Jan 15 20:40:17 2009
@@ -375,7 +375,7 @@
 				      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;
 

Modified: trunk/libempathy/empathy-contact-manager.c
==============================================================================
--- trunk/libempathy/empathy-contact-manager.c	(original)
+++ trunk/libempathy/empathy-contact-manager.c	Thu Jan 15 20:40:17 2009
@@ -249,7 +249,7 @@
 			  "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);

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Thu Jan 15 20:40:17 2009
@@ -926,7 +926,7 @@
     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,

Modified: trunk/libempathy/empathy-idle.c
==============================================================================
--- trunk/libempathy/empathy-idle.c	(original)
+++ trunk/libempathy/empathy-idle.c	Thu Jan 15 20:40:17 2009
@@ -424,7 +424,7 @@
 
 	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);

Modified: trunk/libempathy/empathy-tp-contact-factory.c
==============================================================================
--- trunk/libempathy/empathy-tp-contact-factory.c	(original)
+++ trunk/libempathy/empathy-tp-contact-factory.c	Thu Jan 15 20:40:17 2009
@@ -972,7 +972,7 @@
 		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;

Modified: trunk/libempathy/empathy-tp-contact-list.c
==============================================================================
--- trunk/libempathy/empathy-tp-contact-list.c	(original)
+++ trunk/libempathy/empathy-tp-contact-list.c	Thu Jan 15 20:40:17 2009
@@ -711,7 +711,7 @@
 	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);

Modified: trunk/libempathy/empathy-tp-file.c
==============================================================================
--- trunk/libempathy/empathy-tp-file.c	(original)
+++ trunk/libempathy/empathy-tp-file.c	Thu Jan 15 20:40:17 2009
@@ -506,7 +506,7 @@
   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);

Modified: trunk/libempathy/empathy-tp-roomlist.c
==============================================================================
--- trunk/libempathy/empathy-tp-roomlist.c	(original)
+++ trunk/libempathy/empathy-tp-roomlist.c	Thu Jan 15 20:40:17 2009
@@ -279,7 +279,7 @@
 	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 @@
 
 	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,

Modified: trunk/libempathy/empathy-tp-tube.c
==============================================================================
--- trunk/libempathy/empathy-tp-tube.c	(original)
+++ trunk/libempathy/empathy-tp-tube.c	Thu Jan 15 20:40:17 2009
@@ -291,7 +291,7 @@
   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);

Modified: trunk/libempathy/empathy-utils.c
==============================================================================
--- trunk/libempathy/empathy-utils.c	(original)
+++ trunk/libempathy/empathy-utils.c	Thu Jan 15 20:40:17 2009
@@ -229,7 +229,7 @@
 }
 
 MissionControl *
-empathy_mission_control_new (void)
+empathy_mission_control_dup_singleton (void)
 {
 	static MissionControl *mc = NULL;
 

Modified: trunk/libempathy/empathy-utils.h
==============================================================================
--- trunk/libempathy/empathy-utils.h	(original)
+++ trunk/libempathy/empathy-utils.h	Thu Jan 15 20:40:17 2009
@@ -68,7 +68,7 @@
 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);

Modified: trunk/megaphone/src/megaphone-applet.c
==============================================================================
--- trunk/megaphone/src/megaphone-applet.c	(original)
+++ trunk/megaphone/src/megaphone-applet.c	Thu Jan 15 20:40:17 2009
@@ -443,7 +443,7 @@
 		empathy_contact_get_id (priv->contact),
 		empathy_contact_get_handle (priv->contact));
 
-	mc = empathy_mission_control_new ();
+	mc = empathy_mission_control_dup_singleton ();
 	mission_control_request_channel (mc,
 					 empathy_contact_get_account (priv->contact),
 					 TP_IFACE_CHANNEL_TYPE_TEXT,

Modified: trunk/src/empathy-accounts-dialog.c
==============================================================================
--- trunk/src/empathy-accounts-dialog.c	(original)
+++ trunk/src/empathy-accounts-dialog.c	Thu Jan 15 20:40:17 2009
@@ -1100,7 +1100,7 @@
 
 	/* Set up signalling */
 	dialog->account_manager = empathy_account_manager_dup_singleton ();
-	dialog->mc = empathy_mission_control_new ();
+	dialog->mc = empathy_mission_control_dup_singleton ();
 
 	g_signal_connect (dialog->account_manager, "account-created",
 			  G_CALLBACK (accounts_dialog_account_added_cb),

Modified: trunk/src/empathy-main-window.c
==============================================================================
--- trunk/src/empathy-main-window.c	(original)
+++ trunk/src/empathy-main-window.c	Thu Jan 15 20:40:17 2009
@@ -551,7 +551,7 @@
 	main_window_connection_items_setup (window, glade);
 	g_object_unref (glade);
 
-	window->mc = empathy_mission_control_new ();
+	window->mc = empathy_mission_control_dup_singleton ();
 	window->account_manager = empathy_account_manager_dup_singleton ();
 
 	g_signal_connect (window->account_manager,
@@ -848,7 +848,7 @@
 	McAccount      *account;
 	const gchar    *room;
 
-	mc = empathy_mission_control_new ();
+	mc = empathy_mission_control_dup_singleton ();
 	account = empathy_chatroom_get_account (chatroom);
 	room = empathy_chatroom_get_room (chatroom);
 

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Thu Jan 15 20:40:17 2009
@@ -459,7 +459,7 @@
 	}
 
 	/* Setting up MC */
-	mc = empathy_mission_control_new ();
+	mc = empathy_mission_control_dup_singleton ();
 	g_signal_connect (mc, "ServiceEnded",
 			  G_CALLBACK (service_ended_cb),
 			  NULL);