From ed49fdb2d4477d63e850848f88f318325fd2dec6 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 13 Feb 2009 10:25:45 +0000 Subject: [PATCH] use tp_channel_get_identifier instead of inspecting room handle From: Guillaume Desmottes svn path=/trunk/; revision=2447 --- src/empathy-event-manager.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index c5cf7685..c463f693 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -779,8 +779,6 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, 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 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, } /* 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 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, empathy_sound_play (empathy_main_window_get (), EMPATHY_SOUND_CONVERSATION_NEW); - g_array_free (handles, TRUE); - g_free (names); g_object_unref (group); } } -- 2.39.2