aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-08-04 21:51:59 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-08-04 21:51:59 +0800
commitdc9add8dcc16934a68a4710222da72f5bb4db23a (patch)
treec94a036cbe6037ff07e8ffac4c3b702c1ee7d796 /src
parent3f8365033b9c5881daf4fcf89b86f9dfefec7492 (diff)
downloadgsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.tar
gsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.tar.gz
gsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.tar.bz2
gsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.tar.lz
gsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.tar.xz
gsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.tar.zst
gsoc2013-empathy-dc9add8dcc16934a68a4710222da72f5bb4db23a.zip
Pick the correct contact alias for the message telling incoming call is rejected. Fixes bug #546218.
svn path=/trunk/; revision=1294
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 0de46265b..8edf6817c 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -30,6 +30,7 @@
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-tp-call.h>
+#include <libempathy/empathy-tp-group.h>
#include <libempathy/empathy-utils.h>
#include <libempathy-gtk/empathy-ui-utils.h>
@@ -506,8 +507,13 @@ empathy_call_window_new (TpChannel *channel)
{
GtkWidget *dialog;
EmpathyContact *contact;
+ EmpathyTpGroup *tp_group;
- g_object_get (window->call, "contact", &contact, NULL);
+ tp_group = empathy_tp_group_new (channel);
+ empathy_run_until_ready (tp_group);
+ empathy_tp_group_get_invitation (tp_group, &contact);
+ empathy_contact_run_until_ready (contact, EMPATHY_CONTACT_READY_NAME,
+ NULL);
/* We don't want to have multiple calls running.
* FIXME: We should use the hold interface... */
@@ -519,6 +525,7 @@ empathy_call_window_new (TpChannel *channel)
" running call."), empathy_contact_get_name (contact));
g_object_unref (contact);
+ g_object_unref (tp_group);
g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy),
NULL);