From 83bb1d62a578f41b8961c59cf805230b6ccc0e67 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 17 Aug 2010 16:51:39 +0200 Subject: event-manager: use tp_user_action_time_from_x11() --- src/empathy-event-manager.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/empathy-event-manager.c') diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 0dbb030b5..39d70e6d1 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) { -- cgit v1.2.3