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

[Ken VanDine]

Use IndicateInterests to determine if there are listeners, this will prevent crashers when telepathy-indicator is run in gnome-shell or other environments without a messaging indicator (LP: #947590)

[Sebastien Bacher (seb128)]

Looks fine to me

Is there any reason at all to run the indicator under gnome-shell? Wouldn't it make sense to add an OnlyShowIn=Unity; do the autostart desktop there?

review: Approve

[Ken VanDine (ken-vandine)]

Good idea, I'll do that as well. It is good to check interest anyway, in case the indicator goes away for any reason. If it goes away, and a message arrives, it would cause a crash.

=== modified file 'src/indicator-approver.c'
--- src/indicator-approver.c	2012-03-22 04:10:26 +0000
+++ src/indicator-approver.c	2012-03-22 04:10:26 +0000
@@ -34,6 +34,7 @@
 #include <unity.h>
 
 static GHashTable *indicators = NULL;
+static gboolean has_interest = FALSE;
 UnityLauncherEntry *launcher = NULL;
 GList *conns;
 
@@ -65,7 +66,7 @@
 	}
 
 	const gchar *channel_id;
-	g_debug ("indicator_remove_by_id: %s", id);
+	g_debug ("find_indicator_by_id: %s", id);
 
 	GHashTableIter iter;
 	gpointer data, indicator;
@@ -429,6 +430,13 @@
     GList *channels, TpChannelDispatchOperation *dispatch_op, TpAddDispatchOperationContext *context,
     gpointer user_data)
 {
+	if (has_interest == FALSE)
+	{
+		g_debug ("add_dispatch_operation_cb but there are no listeners with interest");
+		tp_add_dispatch_operation_context_accept (context);
+		return;
+	}
+
 	GList *itr;
 	TpChannel *channel;
 	TpHandle handle;
@@ -454,7 +462,12 @@
     GList *channels, TpChannelDispatchOperation *dispatch_op, GList *requests, TpObserveChannelsContext *context,
     gpointer user_data)
 {
-	g_debug ("observer_add_dispatch_operation_cb");
+	if (has_interest == FALSE)
+	{
+		g_debug ("observer_add_dispatch_operation_cb but there are no listeners with interest");
+		tp_observe_channels_context_accept (context);
+		return;
+	}
 	GList *itr;
 	TpChannel *channel;
 
@@ -483,6 +496,13 @@
 server_display (IndicateServer * indicate_server, guint timestamp, gpointer user_data)
 {
 	g_debug ("server_display at %u", timestamp);
+
+	if (has_interest == FALSE)
+	{
+		g_debug ("server_display but there are no listeners with interest");
+		return;
+	}
+
 	GDesktopAppInfo *app;
 	GError *error = NULL;
 
@@ -500,6 +520,34 @@
 	g_object_unref (app);
 }
 
+static void
+indicate_server_show_interest (IndicateServer * server, IndicateInterests interest, gpointer data)
+{
+	g_debug ("indicate_server_show_interest");
+	if (interest == INDICATE_INTEREST_SERVER_SIGNAL)
+	{
+		if (has_interest == FALSE)
+		{
+			has_interest = TRUE;
+		}
+	}
+	return;
+}
+
+static void
+indicate_server_remove_interest (IndicateServer * server, IndicateInterests interest, gpointer data)
+{
+	g_debug ("indicate_server_remove_interest");
+	if (interest == INDICATE_INTEREST_SERVER_SIGNAL)
+	{
+		if (has_interest == TRUE)
+		{
+			has_interest = FALSE;
+		}
+	}
+	return;
+}
+
 static IndicateServer *
 indicate_server_setup ()
 {
@@ -517,6 +565,17 @@
 	g_signal_connect (G_OBJECT (indicate_server),
 		INDICATE_SERVER_SIGNAL_SERVER_DISPLAY,
 		G_CALLBACK (server_display), NULL);
+
+	g_signal_connect (G_OBJECT (indicate_server), 
+		INDICATE_SERVER_SIGNAL_INTEREST_ADDED, 
+		G_CALLBACK (indicate_server_show_interest), NULL);
+	g_signal_connect (G_OBJECT (indicate_server), 
+		INDICATE_SERVER_SIGNAL_INTEREST_REMOVED, 
+		G_CALLBACK (indicate_server_remove_interest), NULL);
+
+	has_interest = indicate_server_check_interest (indicate_server, 
+				INDICATE_INTEREST_SERVER_SIGNAL);
+	
 	return indicate_server;
 }