From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 20 Apr 2010 08:00:44 +0000 (+0200)
Subject: pass timestamp to empathy_chat_window_present_chat
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=14eab5e164f0078f7d0bfbd580b8ecd19e61d72f

pass timestamp to empathy_chat_window_present_chat
---

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 847c7f83..bdd80ea5 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 93ffcc53..4cbd2094 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 3f1cc650..5dcf035e 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);
     }