diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-24 23:23:22 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-09-05 22:53:37 +0800 |
| commit | b499944f633b2c8b5efd7c19b27399520c46ae66 (patch) | |
| tree | da46ce5ab1610d9de72be36f6b375579b364fbe6 /src | |
| parent | 2ab17b3039eef2c93d6fce4c5bee5f452fa8e8c1 (diff) | |
| download | gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.gz gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.bz2 gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.lz gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.xz gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.zst gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 6 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 4 |
2 files changed, 7 insertions, 3 deletions
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; |