Use the new dispatcher api to request text channels

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2131

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index f9fbce92f99bc4cfd6bd30a79a44cc2cbc90ae2d..5e83f3b63a53c30bc77b2301ca6adbce6f372e77 100644 (file)
--- 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 ab1c6530acad84e09b685a56216cbfc2dc5d498d..ff91a182a5797b31f3d755f19a6848a98190fa0a 100644 (file)
--- 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 6bce53b9c8c1c48387004870856e0a31ad7fcde8..c9e67d3c50c7d913c7d63562324787f6be448e76 100644 (file)
--- 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;