Merge lp:~larsu/telepathy-indicator/lp1103438 into lp:telepathy-indicator

[Lars Karlitski]

Inform the messaging menu about online status when empathy appears

Inform the messaging menu about online status when empathy appears

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/indicator-approver.c'
--- src/indicator-approver.c	2014-04-10 08:30:20 +0000
+++ src/indicator-approver.c	2014-04-10 18:23:20 +0000
@@ -1047,7 +1047,6 @@
 	TpAccountManager *tp_am;
 	TpBaseClient *approver;
 	TpBaseClient *observer;
-	TpConnectionPresenceType presence;
 	GError *error = NULL;
 
 	g_debug (G_STRFUNC);
@@ -1074,8 +1073,6 @@
 		return;
 	}
 
-	presence = tp_account_manager_get_most_available_presence (tp_am, NULL, NULL);
-	presence_changed (tp_am, presence, "", "", NULL);
 	g_signal_connect(tp_am, "most-available-presence-changed",
 			 G_CALLBACK (presence_changed), NULL);
 	g_signal_connect (tp_am, "account-enabled", 
@@ -1100,6 +1097,9 @@
 		  const gchar     *name_owner,
 		  gpointer         user_data)
 {
+	TpAccountManager *tp_am;
+	TpConnectionPresenceType presence;
+
 	mmapp = messaging_menu_app_new ("empathy.desktop");
 
 	if (check_enabled_accounts ())
@@ -1109,6 +1109,12 @@
 			  G_CALLBACK (message_source_activated), NULL);
 	g_signal_connect (mmapp, "status-changed",
 			  G_CALLBACK (messaging_menu_status_changed), NULL);
+
+	tp_am = tp_account_manager_dup ();
+	presence = tp_account_manager_get_most_available_presence (tp_am, NULL, NULL);
+	presence_changed (tp_am, presence, "", "", NULL);
+
+	g_object_unref (tp_am);
 }
 
 static void