diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-10-14 12:31:16 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-10-14 12:32:13 +0800 |
| commit | fecbf935f2b9be2cd6229099334279028fc517f1 (patch) | |
| tree | 055bc011da6b83f607016f10e8a5da5d7bc017d6 /src | |
| parent | 7b6b8da406493311445f6c2470a005a542972693 (diff) | |
| parent | 16e0d5a45bb1e11d57c4d5e512f021ebb6d2da12 (diff) | |
| download | gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.gz gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.bz2 gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.lz gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.xz gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.zst gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.zip | |
Merge remote-tracking branch 'pochu/error-dialog'
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 7f37cc5c4..a52585736 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 44f3dcce3..46f76466b 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1865,7 +1865,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; |