diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-18 22:27:44 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-18 22:27:44 +0800 |
| commit | ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f (patch) | |
| tree | 00f26f846d8df7206f581d4957116d80c4f8202e /src/empathy.c | |
| parent | 7f7da422bd805bb0a44135c107f013882f5824dc (diff) | |
| download | gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.tar gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.tar.gz gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.tar.bz2 gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.tar.lz gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.tar.xz gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.tar.zst gsoc2013-empathy-ec55d4f9308a0eb65c6ea5de7e9757e9d8b0b70f.zip | |
Improve dispatcher. Fixes bug #465928.
svn path=/trunk/; revision=1108
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/empathy.c b/src/empathy.c index 242f946a1..19d9cb220 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -40,7 +40,7 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-tp-chat.h> -#include <libempathy/empathy-tp-call.h> +#include <libempathy/empathy-tp-group.h> #include <libempathy-gtk/empathy-conf.h> @@ -98,11 +98,14 @@ dispatch_channel_cb (EmpathyDispatcher *dispatcher, g_object_unref (tp_chat); } else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) { - EmpathyTpCall *tp_call; + GtkWidget *window; - tp_call = empathy_tp_call_new (channel); - empathy_call_window_new (tp_call); - g_object_unref (tp_call); + window = empathy_call_window_find (channel); + if (window) { + gtk_window_present (GTK_WINDOW (window)); + } else { + empathy_call_window_new (channel); + } } } |