aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2009-02-13 18:25:51 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-13 18:25:51 +0800
commit0b2b9b93ae9dabd88b8d41613561311786ce5bdd (patch)
treed2db9e1e0471b2a6ff8f92410fde4e272949522d
parented49fdb2d4477d63e850848f88f318325fd2dec6 (diff)
downloadgsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.tar
gsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.tar.gz
gsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.tar.bz2
gsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.tar.lz
gsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.tar.xz
gsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.tar.zst
gsoc2013-empathy-0b2b9b93ae9dabd88b8d41613561311786ce5bdd.zip
use tp_channel_get_identifier in event_room_channel_process_func too
From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2448
-rw-r--r--src/empathy-event-manager.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c463f693f..2ab139836 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -680,9 +680,6 @@ static void
event_room_channel_process_func (EventPriv *event)
{
GtkWidget *dialog, *button, *image;
- TpHandle room_handle;
- GArray *handles;
- gchar **names;
TpChannel *channel = empathy_dispatch_operation_get_channel (
event->approval->operation);
@@ -692,16 +689,6 @@ event_room_channel_process_func (EventPriv *event)
return;
}
- /* get room name */
- room_handle = tp_channel_get_handle (channel, NULL);
-
- handles = g_array_new (FALSE, FALSE, sizeof (guint));
- g_array_append_val (handles, room_handle);
-
- tp_cli_connection_run_inspect_handles (
- tp_channel_borrow_connection (channel), -1,
- TP_HANDLE_TYPE_ROOM, handles, &names, NULL, NULL);
-
/* create dialog */
dialog = gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, _("Room invitation"));
@@ -709,7 +696,7 @@ event_room_channel_process_func (EventPriv *event)
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("%s is inviting you to join %s"),
empathy_contact_get_name (event->approval->contact),
- *names);
+ tp_channel_get_identifier (channel));
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_OK);
@@ -729,9 +716,6 @@ event_room_channel_process_func (EventPriv *event)
gtk_widget_show (dialog);
- g_array_free (handles, TRUE);
- g_free (names);
-
event->approval->dialog = dialog;
}