diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-04-20 16:00:44 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-04-25 02:44:09 +0800 |
| commit | 14eab5e164f0078f7d0bfbd580b8ecd19e61d72f (patch) | |
| tree | 0da6bc4d32b39c8201ca8f79b2f1841850d5a2e5 | |
| parent | cdd773bdb91f860c502864bf9d40df45f935aa7c (diff) | |
| download | gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.tar gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.tar.gz gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.tar.bz2 gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.tar.lz gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.tar.xz gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.tar.zst gsoc2013-empathy-14eab5e164f0078f7d0bfbd580b8ecd19e61d72f.zip | |
pass timestamp to empathy_chat_window_present_chat
| -rw-r--r-- | src/empathy-chat-window.c | 6 | ||||
| -rw-r--r-- | src/empathy-chat-window.h | 3 | ||||
| -rw-r--r-- | src/empathy.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 847c7f834..bdd80ea5e 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1704,7 +1704,8 @@ chat_window_drag_data_received (GtkWidget *widget, } /* Added to take care of any outstanding chat events */ - empathy_chat_window_present_chat (chat); + empathy_chat_window_present_chat (chat, + EMPATHY_DISPATCHER_NON_USER_ACTION); /* We should return TRUE to remove the data when doing * GDK_ACTION_MOVE, but we don't here otherwise it has @@ -2267,7 +2268,8 @@ empathy_chat_window_find_chat (TpAccount *account, } void -empathy_chat_window_present_chat (EmpathyChat *chat) +empathy_chat_window_present_chat (EmpathyChat *chat, + gint64 timestamp) { EmpathyChatWindow *window; EmpathyChatWindowPriv *priv; diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index 93ffcc53a..4cbd2094a 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -72,7 +72,8 @@ void empathy_chat_window_switch_to_chat (EmpathyChatWindow *window gboolean empathy_chat_window_has_focus (EmpathyChatWindow *window); EmpathyChat * empathy_chat_window_find_chat (TpAccount *account, const gchar *id); -void empathy_chat_window_present_chat (EmpathyChat *chat); +void empathy_chat_window_present_chat (EmpathyChat *chat, + gint64 timestamp); void empathy_chat_window_get_nb_chats (EmpathyChatWindow *window, guint *nb_rooms, diff --git a/src/empathy.c b/src/empathy.c index 3f1cc6504..5dcf035e3 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -133,7 +133,8 @@ dispatch_cb (EmpathyDispatcher *dispatcher, * (a GtkNotebook) when we'll call empathy_chat_window_present_chat */ } - empathy_chat_window_present_chat (chat); + empathy_chat_window_present_chat (chat, + empathy_dispatch_operation_get_user_action_time (operation)); empathy_dispatch_operation_claim (operation); } |