aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-25 00:16:32 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-25 02:44:09 +0800
commit54ae82bdf32156387e3d720656bd361a859b8db6 (patch)
tree3b634c9ed82c0dcb3685ce21d2097df9d6c9d3dd /src
parent985a3c10e9fa40d2023f73df03d7709816bf0ecc (diff)
downloadgsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.tar
gsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.tar.gz
gsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.tar.bz2
gsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.tar.lz
gsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.tar.xz
gsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.tar.zst
gsoc2013-empathy-54ae82bdf32156387e3d720656bd361a859b8db6.zip
add timestamp arg to empathy_dispatcher_chat_with_contact(_id)
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-manager.c2
-rw-r--r--src/empathy-chat-window.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 01506f52e..35b23244c 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -202,7 +202,7 @@ connection_ready_cb (TpConnection *connection,
empathy_dispatcher_join_muc (connection, data->id, NULL, NULL);
else
empathy_dispatcher_chat_with_contact_id (connection, data->id,
- NULL, NULL);
+ EMPATHY_DISPATCHER_NON_USER_ACTION, NULL, NULL);
g_signal_emit (self, signals[CHATS_CHANGED], 0,
g_queue_get_length (priv->queue));
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6e80bb458..847c7f834 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1682,7 +1682,7 @@ chat_window_drag_data_received (GtkWidget *widget,
if (connection) {
empathy_dispatcher_chat_with_contact_id (
- connection, contact_id, NULL, NULL);
+ connection, contact_id, gtk_get_current_event_time (), NULL, NULL);
}
g_strfreev (strv);