Merge lp:~ken-vandine/telepathy-indicator/lp_1046360 into lp:telepathy-indicator

[Ken VanDine]

don't register with messaging menu unless we have enabled IM accounts

[Lars Karlitski (larsu)]

Works, but has a memory leak in check_enabled_accounts:

tp_account_manager_dup_valid_accounts returns a list of reffed TpAccounts. Instead of using g_list_free, the returned list should be freed with

  g_list_free_full (account_list, g_object_unref)

to unref the contained accounts.

Also, the `g_list_free (account_service_list)` can be removed, it doesn't free anything (account_service_list is NULL after the loop has run through).

Thanks!

review: Needs Fixing

[lp:~ken-vandine/telepathy-indicator/lp_1046360]

66. By Ken VanDine on 2012-10-11

fixed a leak

[Ken VanDine (ken-vandine)]

OK, I've updated the branch per your feedback. Thanks!

[Lars Karlitski (larsu)]

Great, thanks!

review: Approve

=== modified file 'src/indicator-approver.c'
--- src/indicator-approver.c	2012-08-27 14:18:16 +0000
+++ src/indicator-approver.c	2012-10-11 13:21:24 +0000
@@ -777,6 +777,16 @@
 	g_debug ("account_enabled_cb");
 
 	add_account (account, manager);
+	if (valid == TRUE)
+	{
+		messaging_menu_app_register (mmapp);
+		return;
+	}
+        if (!check_enabled_accounts ())
+	{
+		messaging_menu_app_unregister (mmapp);
+	}
+
 }
 
 static void
@@ -978,20 +988,64 @@
 	tp_account_manager_set_all_requested_presences (tp_am, status, "", "");
 }
 
-int
-main (int argc, char **argv)
-{
-	GMainLoop *loop = NULL;
+gboolean check_enabled_accounts ()
+{
+	gboolean r = FALSE;
+	TpAccountManager* tp_am = tp_account_manager_dup ();
+	GList* account_service_list = NULL;
+	GList* account_list = tp_account_manager_dup_valid_accounts (tp_am);
+
+	for (account_service_list = account_list; account_service_list != NULL; account_service_list = account_service_list->next) {
+		TpAccount* account = NULL;
+		account = (TpAccount*) account_service_list->data;
+		if (tp_account_is_enabled (account))
+		{
+			g_debug ("ENABLED: %s", tp_account_get_cm_name (account));
+			r = TRUE;
+		} else
+		{
+			g_debug ("DISABLED: %s", tp_account_get_cm_name (account));
+		}
+	}
+
+	g_list_free_full (account_list, g_object_unref);
+	g_object_unref(G_OBJECT(tp_am));
+	return r;
+}
+
+static void on_enabled_event (TpAccountManager* self, TpAccount* account, gpointer user_data)
+{
+	g_debug ("on_enabled_event");
+	messaging_menu_app_register (mmapp);
+}
+
+static void on_disabled_event (TpAccountManager* self, TpAccount* account, gpointer user_data)
+{
+	g_debug ("on_disabled_event");
+	if (!check_enabled_accounts ())
+	{
+		messaging_menu_app_unregister (mmapp);
+	}
+}
+
+
+static void on_account_removed_event (TpAccountManager* self, TpAccount* account, gpointer user_data)
+{
+	g_debug ("on_account_removed_event");
+	if (!check_enabled_accounts ())
+	{
+		messaging_menu_app_unregister (mmapp);
+	}
+}
+
+	
+int setup ()
+{
 	TpConnectionPresenceType presence;
 
-	g_type_init ();
-
-	gtk_init (&argc, &argv);
 	TpBaseClient *approver;
 	TpBaseClient *observer;
 
-	loop = g_main_loop_new (NULL, FALSE);
-
 	TpAccountManager *tp_am = tp_account_manager_dup ();
 
 	approver = approver_setup (tp_am);
@@ -1008,7 +1062,6 @@
 	}
 
 	mmapp = messaging_menu_app_new ("empathy.desktop");
-	messaging_menu_app_register (mmapp);
 
 	g_signal_connect (mmapp, "activate-source",
 			  G_CALLBACK (message_source_activated), tp_am);
@@ -1019,17 +1072,43 @@
 	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", 
+			  G_CALLBACK (on_enabled_event), NULL);
+	g_signal_connect (tp_am, "account-disabled", 
+			  G_CALLBACK (on_disabled_event), NULL);
+	g_signal_connect (tp_am, "account-removed", 
+			  G_CALLBACK (on_account_removed_event), NULL);
 
 	dispatch_ops = g_hash_table_new_full (g_str_hash, g_str_equal,
 					      g_free, g_object_unref);
-
 	launcher = unity_launcher_entry_get_for_desktop_id ("empathy.desktop");
 
 	contact_list_setup (tp_am);
+}
+
+
+int
+main (int argc, char **argv)
+{
+	int ret = 0;
+	GMainLoop *loop = NULL;
+	g_type_init ();
+	gtk_init (&argc, &argv);
+
+	loop = g_main_loop_new (NULL, FALSE);
+
+	ret = setup ();
+	if (ret == 1)
+		return ret;
+
+	if (check_enabled_accounts ())
+	{
+		messaging_menu_app_register (mmapp);
+	}
 
 	g_debug ("Telepathy Indicator started");
 	g_main_loop_run (loop);
 
 	g_main_loop_unref (loop);
-	return 0;
+	return ret;
 }