[empathy] event-manager: use tp_user_action_time_from_x11()
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] event-manager: use tp_user_action_time_from_x11()
- Date: Wed, 18 Aug 2010 07:30:03 +0000 (UTC)
commit 83bb1d62a578f41b8961c59cf805230b6ccc0e67
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Aug 17 16:51:39 2010 +0200
event-manager: use tp_user_action_time_from_x11()
src/empathy-event-manager.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 0dbb030..39d70e6 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -312,10 +312,7 @@ event_manager_approval_approve (EventManagerApproval *approval)
}
else
{
- timestamp = gtk_get_current_event_time ();
-
- if (timestamp == GDK_CURRENT_TIME)
- timestamp = TP_USER_ACTION_TIME_CURRENT_TIME;
+ timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ());
}
g_assert (approval->operation != NULL);
@@ -334,9 +331,9 @@ static void
event_text_channel_process_func (EventPriv *event)
{
EmpathyTpChat *tp_chat;
- gint64 timestamp = gtk_get_current_event_time ();
- if (timestamp == GDK_CURRENT_TIME)
- timestamp = TP_USER_ACTION_TIME_CURRENT_TIME;
+ gint64 timestamp;
+
+ timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ());
if (event->approval->handler != 0)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]