empathy r2722 - branches/gnome-2-26/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Mar 20 14:11:35 2009
New Revision: 2722
URL: http://svn.gnome.org/viewvc/empathy?rev=2722&view=rev

Log:
Use tp_channel_get_identifier instead of inspecting channel's handle. Fixes bug

From: Xavier Claessens <xclaesse gmail com>

Modified:
   branches/gnome-2-26/libempathy/empathy-tp-chat.c

Modified: branches/gnome-2-26/libempathy/empathy-tp-chat.c
==============================================================================
--- branches/gnome-2-26/libempathy/empathy-tp-chat.c	(original)
+++ branches/gnome-2-26/libempathy/empathy-tp-chat.c	Fri Mar 20 14:11:35 2009
@@ -49,7 +49,6 @@
 	EmpathyTpGroup        *group;
 	McAccount             *account;
 	TpChannel             *channel;
-	gchar                 *id;
 	gboolean               listing_pending_messages;
 	/* Queue of messages not signalled yet */
 	GQueue                *messages_queue;
@@ -843,20 +842,6 @@
 		      "handle_type", &handle_type,
 		      NULL);
 
-	if (handle_type != TP_HANDLE_TYPE_NONE && handle != 0) {
-		GArray *handles;
-		gchar **names;
-
-		handles = g_array_new (FALSE, FALSE, sizeof (guint));
-		g_array_append_val (handles, handle);
-		tp_cli_connection_run_inspect_handles (connection, -1,
-						       handle_type, handles,
-						       &names, NULL, NULL);
-		priv->id = *names;
-		g_array_free (handles, TRUE);
-		g_free (names);
-	}
-
 	if (handle_type == TP_HANDLE_TYPE_CONTACT && handle != 0) {
 		priv->remote_contact = empathy_contact_factory_get_from_handle (priv->factory,
 										priv->account,
@@ -1016,8 +1001,6 @@
 		g_ptr_array_free (priv->properties, TRUE);
 	}
 
-
-	g_free (priv->id);
 	g_queue_free (priv->messages_queue);
 	g_queue_free (priv->pending_messages_queue);
 
@@ -1242,7 +1225,7 @@
 	g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
 	g_return_val_if_fail (priv->ready, NULL);
 
-	return priv->id;
+	return tp_channel_get_identifier (priv->channel);
 }
 
 EmpathyContact *