empathy r2447 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Feb 13 10:25:45 2009
New Revision: 2447
URL: http://svn.gnome.org/viewvc/empathy?rev=2447&view=rev

Log:
use tp_channel_get_identifier instead of inspecting room handle

From: Guillaume Desmottes <gdesmott gnome org>

Modified:
   trunk/src/empathy-event-manager.c

Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c	(original)
+++ trunk/src/empathy-event-manager.c	Fri Feb 13 10:25:45 2009
@@ -779,8 +779,6 @@
           EmpathyTpGroup *group;
           EmpathyPendingInfo *info;
           gchar *msg;
-          GArray *handles;
-          gchar **names;
 
           group = empathy_tp_group_new (channel);
           empathy_run_until_ready (group);
@@ -799,14 +797,9 @@
             }
 
           /* We are invited to a room */
-          handles = g_array_new (FALSE, FALSE, sizeof (guint));
-          g_array_append_val (handles, handle);
-          tp_cli_connection_run_inspect_handles (
-              tp_channel_borrow_connection (channel), -1,
-              TP_HANDLE_TYPE_ROOM, handles, &names, NULL, NULL);
-
           msg = g_strdup_printf ("%s invited you to join %s",
-              empathy_contact_get_name (info->actor), *names);
+              empathy_contact_get_name (info->actor),
+              tp_channel_get_identifier (channel));
 
           approval->contact = g_object_ref (info->actor);
 
@@ -817,8 +810,6 @@
           empathy_sound_play (empathy_main_window_get (),
             EMPATHY_SOUND_CONVERSATION_NEW);
 
-          g_array_free (handles, TRUE);
-          g_free (names);
           g_object_unref (group);
         }
     }