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 /libempathy-gtk | |
| 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 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 5 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 7 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-message-dialog.c | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 90598d393..3c4d234b7 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -36,6 +36,7 @@ #include <libempathy/empathy-contact-factory.h> #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-contact-groups.h> +#include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-utils.h> #include "empathy-contact-list-view.h" @@ -462,7 +463,7 @@ contact_list_view_row_activated_cb (EmpathyContactListView *view, -1); if (contact) { - empathy_chat_with_contact (contact); + empathy_dispatcher_chat_with_contact (contact); g_object_unref (contact); } } @@ -491,7 +492,7 @@ contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell, -1); if (contact) { - empathy_call_with_contact (contact); + empathy_dispatcher_call_with_contact (contact); g_object_unref (contact); } } diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 275729f98..81c94a6db 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -26,8 +26,9 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include <libempathy/empathy-utils.h> #include <libempathy/empathy-log-manager.h> +#include <libempathy/empathy-dispatcher.h> +#include <libempathy/empathy-utils.h> #include "empathy-contact-menu.h" #include "empathy-images.h" @@ -112,7 +113,7 @@ empathy_contact_chat_menu_item_new (EmpathyContact *contact) gtk_widget_show (image); g_signal_connect_swapped (item, "activate", - G_CALLBACK (empathy_chat_with_contact), + G_CALLBACK (empathy_dispatcher_chat_with_contact), contact); return item; @@ -134,7 +135,7 @@ empathy_contact_call_menu_item_new (EmpathyContact *contact) gtk_widget_show (image); g_signal_connect_swapped (item, "activate", - G_CALLBACK (empathy_call_with_contact), + G_CALLBACK (empathy_dispatcher_call_with_contact), contact); return item; diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index b07f13e21..fc4c0f887 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -32,6 +32,7 @@ #include <libmissioncontrol/mission-control.h> #include <libempathy/empathy-contact-factory.h> +#include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-utils.h> #include <libempathy-gtk/empathy-ui-utils.h> @@ -67,10 +68,10 @@ new_message_dialog_response_cb (GtkWidget *widget, } if (response == 1) { - empathy_call_with_contact_id (account, id); + empathy_dispatcher_call_with_contact_id (account, id); } else if (response == 2) { - empathy_chat_with_contact_id (account, id); + empathy_dispatcher_chat_with_contact_id (account, id); } g_object_unref (account); |