diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-01-10 00:12:11 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-10 00:12:11 +0800 |
| commit | de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b (patch) | |
| tree | 6d34ad438557cd82b7fc83c327265f7fd9c5c45c | |
| parent | 9940bfed4c589710add05be776b7b1817bf9d48d (diff) | |
| download | gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.tar gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.tar.gz gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.tar.bz2 gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.tar.lz gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.tar.xz gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.tar.zst gsoc2013-empathy-de7f1fe51aed7cb5b81d85d6bbb73d50b4f7de0b.zip | |
Use the new dispatcher api to request text channels
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2131
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-message-dialog.c | 7 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index f9fbce92f..5e83f3b63 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -542,7 +542,7 @@ contact_list_view_row_activated (GtkTreeView *view, if (contact) { DEBUG ("Starting a chat"); - empathy_dispatcher_chat_with_contact (contact); + empathy_dispatcher_chat_with_contact (contact, NULL, NULL); g_object_unref (contact); } } @@ -571,7 +571,7 @@ contact_list_view_voip_activated_cb (EmpathyCellRendererActivatable *cell, -1); if (contact) { - empathy_dispatcher_call_with_contact (contact); + empathy_dispatcher_call_with_contact (contact, NULL, NULL); g_object_unref (contact); } } diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index ab1c6530a..ff91a182a 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -184,10 +184,9 @@ new_message_dialog_response_cb (GtkWidget *widget, } if (response == 1) { - empathy_dispatcher_call_with_contact_id (account, id); - } - else if (response == 2) { - empathy_dispatcher_chat_with_contact_id (account, id); + empathy_dispatcher_call_with_contact_id (account, id, NULL, NULL); + } else if (response == 2) { + empathy_dispatcher_chat_with_contact_id (account, id, NULL, NULL); } g_object_unref (account); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 6bce53b9c..c9e67d3c5 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1081,7 +1081,7 @@ chat_window_drag_data_received (GtkWidget *widget, chat = empathy_chat_window_find_chat (account, strv[1]); if (!chat) { - empathy_dispatcher_chat_with_contact_id (account, strv[2]); + empathy_dispatcher_chat_with_contact_id (account, strv[2], NULL, NULL); g_object_unref (account); g_strfreev (strv); return; |