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

[Ken VanDine]

 * use get_requested to determine if we should get the contact with get_initiator_contact or get_target_contact (LP: #926072)
 * don't observe chat room channels, it seems there is no way to sanely determine if we should get notified. The observer in gnome-shell doesn't observe chat room channels either.

[Ken VanDine (ken-vandine)]

This will also fix (LP: #910785)

[Ken VanDine (ken-vandine)]

This will also fix (LP: #929002)

[Sebastien Bacher (seb128)]

looks fine to me!

review: Approve

=== modified file 'src/indicator-approver.c'
--- src/indicator-approver.c	2012-02-16 18:37:01 +0000
+++ src/indicator-approver.c	2012-03-21 20:09:17 +0000
@@ -217,6 +217,19 @@
 	return FALSE;
 }
 
+static TpContact *
+get_contact_from_channel (TpChannel * channel)
+{
+	g_return_val_if_fail (TP_IS_CHANNEL (channel), NULL);
+	TpContact *contact = NULL;
+	if (tp_channel_get_requested (TP_CHANNEL (channel)))
+		contact = tp_channel_get_target_contact (TP_CHANNEL (channel));
+	else
+		contact = tp_channel_get_initiator_contact (TP_CHANNEL (channel));
+	return TP_CONTACT (contact);
+}
+	
+
 static void
 handle_contacts_pending_add_indicator_cb (TpConnection *connection, guint n_contacts, TpContact * const *contacts, guint n_failed, const TpHandle *failed, const GError *err, gpointer user_data, GObject *weak_object)
 {
@@ -227,9 +240,22 @@
 	const gchar *alias = "";
 	GFile *avatar = NULL;
 	GdkPixbuf *pixbuf = NULL;
-	TpContact *contact = contacts[0];
-	alias = tp_contact_get_alias (contact);
-	avatar = tp_contact_get_avatar_file (contact);
+	TpContact *contact = NULL;
+
+	contact = get_contact_from_channel (channel);
+
+	if (contact)
+	{
+		alias = tp_contact_get_alias (contact);
+		avatar = tp_contact_get_avatar_file (contact);
+		g_debug ("handle_contacts_pending_add_indicator_cb HAS CONTACT alias: %s", alias);
+	} else
+	{
+		alias = tp_channel_get_initiator_identifier (channel);
+		g_debug ("handle_contacts_pending_add_indicator_cb NO CONTACT alias: %s", alias);
+	}
+	g_debug ("handle_contacts_pending_add_indicator_cb alias: %s", alias);
+
 	id = tp_channel_get_identifier (TP_CHANNEL (channel));
 	IndicateIndicator *indicator;
 	indicator = indicate_indicator_new ();
@@ -316,7 +342,6 @@
 message_received_cb (TpTextChannel *channel, TpMessage *message, gpointer user_data)
 {
 	g_debug ("message_received_cb: %s", tp_channel_get_identifier (TP_CHANNEL (channel)));
-	
 	g_timeout_add (100, check_pending_messages, channel);
 }
 
@@ -324,6 +349,7 @@
 handle_contacts_add_indicator_cb (TpConnection *connection, guint n_contacts, TpContact * const *contacts, guint n_failed, const TpHandle *failed, const GError *err, gpointer user_data, GObject *weak_object)
 {
 	IndicateIndicator *indicator = NULL;
+	TpContact *contact = NULL;
 	const gchar *id = "";
 	const gchar *alias = "";
 	GTimeVal time;
@@ -338,17 +364,19 @@
 	channels = tp_channel_dispatch_operation_borrow_channels (dispatch_op);
 	channel = g_ptr_array_index (channels, 0);
 
-	if (TP_IS_CHANNEL (channel))
+	contact = get_contact_from_channel (channel);
+
+	if (contact)
+	{
+		alias = tp_contact_get_alias (contact);
+		avatar = tp_contact_get_avatar_file (contact);
+	} else
 	{
 		alias = tp_channel_get_initiator_identifier (channel);
-		id = tp_channel_get_identifier (TP_CHANNEL (channel));
 	}
+	g_debug ("handle_contacts_add_indicator_cb alias: %s", alias);
 
-	if (contacts)
-	{
-		alias = tp_contact_get_alias (contacts[0]);
-		avatar = tp_contact_get_avatar_file (contacts[0]);
-	}
+	id = tp_channel_get_identifier (TP_CHANNEL (channel));
 
 	if (check_indicator (id))
 	{
@@ -445,7 +473,6 @@
 				G_CALLBACK (pending_message_removed_cb), NULL);
 
 			check_pending_messages (TP_CHANNEL (channel));
-
 		}
 	}
 	g_list_free(itr);
@@ -934,12 +961,6 @@
 		TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
 		NULL));
 
-	/* room text chat */
-	tp_base_client_take_observer_filter (observer, tp_asv_new (
-		TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-		TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_ROOM,
-		NULL));
-
 	if (!tp_base_client_register (observer, &error))
 	{
 		if (error)