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

[Lars Karlitski]

Remove source when a connection dies

Remove source when a connection dies

Keep a hashtable mapping connections to all sources that are associated with that connection. When the connection dies, remove those sources.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/telepathy-indicator-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-indicator-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-indicator-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-indicator-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-indicator-ci/3/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Seems like we should be able to call update_launcher() once after removing all the items. Not critical, but seems like it would be better.

Top approve if you want to land as-is.

review: Approve

[lp:~larsu/telepathy-indicator/lp1302930]

80. By Lars Karlitski on 2014-04-17

Don't unnecessarily call update_launcher()

[Lars Karlitski (larsu)]

Good catch, thanks. Fixed in r80.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/telepathy-indicator-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-indicator-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-indicator-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-indicator-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-indicator-ci/4/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Housekeeping: top-approving based on ted's approve

=== modified file 'src/indicator-approver.c'
--- src/indicator-approver.c	2014-04-10 18:15:31 +0000
+++ src/indicator-approver.c	2014-04-17 12:38:28 +0000
@@ -35,7 +35,7 @@
 GHashTable *dispatch_ops;
 static gint n_sources;
 UnityLauncherEntry *launcher = NULL;
-GList *conns;
+GHashTable *conns; /* connection object -> set of mmapp ids for that connection */
 TpBaseClient *approver;
 TpBaseClient *observer;
 
@@ -57,30 +57,51 @@
 	}
 }
 
+void
+remember_id_for_connection (TpConnection *con,
+			    const gchar  *id)
+{
+	GHashTable *ids;
+
+	ids = g_hash_table_lookup (conns, con);
+	if (ids != NULL)
+		g_hash_table_add (ids, g_strdup (id));
+	else
+		g_warning ("%s: never seen chanel '%s' before", G_STRFUNC, id);
+}
+
 static gchar *
 channel_id (TpChannel *channel)
 {
 	TpConnection *con;
+	gchar *id;
 
 	con = tp_channel_get_connection (channel);
-
-	return g_strconcat ("channel:",
-			    tp_proxy_get_object_path (TP_PROXY (con)), ":",
-			    tp_proxy_get_object_path (TP_PROXY (channel)),
-			    NULL);
+	id = g_strconcat ("channel:",
+			  tp_proxy_get_object_path (TP_PROXY (con)), ":",
+			  tp_proxy_get_object_path (TP_PROXY (channel)),
+			  NULL);
+
+	remember_id_for_connection (con, id);
+
+	return id;
 }
 
 static gchar *
 contact_id (TpContact *contact)
 {
 	TpConnection *con;
+	gchar *id;
 
 	con = tp_contact_get_connection (contact);
-
-	return g_strconcat ("contact:",
-			    tp_proxy_get_object_path (TP_PROXY (con)), ":",
-			    tp_contact_get_identifier (contact),
-			    NULL);
+	id = g_strconcat ("contact:",
+			  tp_proxy_get_object_path (TP_PROXY (con)), ":",
+			  tp_contact_get_identifier (contact),
+			  NULL);
+
+	remember_id_for_connection (con, id);
+
+	return id;
 }
 
 static void
@@ -680,8 +701,7 @@
 conn_invalidated_cb (TpConnection *conn, guint domain, gint code, gchar *message, gpointer user_data)
 {
 	g_debug ("conn_invalidated_cb");
-	conns = g_list_remove (conns, conn);
-	g_object_unref (conn);
+	g_hash_table_remove (conns, conn);
 }
 
 static void
@@ -760,12 +780,13 @@
 	if (connection == NULL)
 		return;
 
-	if (g_list_find (conns, connection) != NULL)
+	if (g_hash_table_contains (conns, connection))
 		return;
 
 	g_debug ("account_manager_prepared_cb %s", tp_connection_get_cm_name (connection));
 
-	conns = g_list_prepend (conns, g_object_ref (connection));
+	g_hash_table_insert (conns, g_object_ref (connection),
+			     g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL));
 
 	tp_g_signal_connect_object (connection, "contact-list-changed",
 		G_CALLBACK (contact_list_changed_cb), manager, 0);
@@ -1092,6 +1113,29 @@
 }
 
 static void
+free_ids_hash (gpointer data)
+{
+  GHashTable *ids = data;
+
+  if (mmapp)
+    {
+      GHashTableIter iter;
+      gpointer id;
+
+      g_hash_table_iter_init (&iter, ids);
+      while (g_hash_table_iter_next (&iter, &id, NULL))
+        {
+          messaging_menu_app_remove_source (mmapp, id);
+          --n_sources;
+        }
+
+      update_launcher (n_sources);
+    }
+
+  g_hash_table_unref (ids);
+}
+
+static void
 empathy_appeared (GDBusConnection *connection,
 		  const gchar     *name,
 		  const gchar     *name_owner,
@@ -1101,6 +1145,7 @@
 	TpConnectionPresenceType presence;
 
 	mmapp = messaging_menu_app_new ("empathy.desktop");
+	conns = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, free_ids_hash);
 
 	if (check_enabled_accounts ())
 		messaging_menu_app_register (mmapp);
@@ -1126,6 +1171,7 @@
 
 	g_clear_object (&launcher);
 	g_clear_object (&mmapp);
+	g_clear_pointer (&conns, g_hash_table_unref);
 }
 
 int