From b499944f633b2c8b5efd7c19b27399520c46ae66 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 24 May 2011 16:23:22 +0100 Subject: empathy_dispatcher_chat_with_contact_id(): add optional cb Conflicts: libempathy-gtk/empathy-individual-menu.c libempathy-gtk/empathy-new-message-dialog.c libempathy/empathy-dispatcher.c libempathy/empathy-dispatcher.h src/empathy-chat-manager.c src/empathy-chat-window.c --- src/empathy-chat-manager.c | 6 ++++-- src/empathy-chat-window.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 0e1745edb..5f19159c5 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -448,9 +448,11 @@ empathy_chat_manager_undo_closed_chat (EmpathyChatManager *self, if (data->room) empathy_join_muc (data->account, data->id, timestamp); else if (data->sms) - empathy_sms_contact_id (data->account, data->id, timestamp); + empathy_sms_contact_id (data->account, data->id, timestamp, + NULL, NULL); else - empathy_chat_with_contact_id (data->account, data->id, timestamp); + empathy_chat_with_contact_id (data->account, data->id, timestamp, + NULL, NULL); g_signal_emit (self, signals[CLOSED_CHATS_CHANGED], 0, g_queue_get_length (priv->closed_queue)); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 97ed1b9de..a84eef7a0 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1866,7 +1866,9 @@ chat_window_drag_data_received (GtkWidget *widget, if (!chat) { empathy_chat_with_contact_id ( - account, contact_id, empathy_get_current_action_time ()); + account, contact_id, + empathy_get_current_action_time (), + NULL, NULL); g_strfreev (strv); return; -- cgit v1.2.3