aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-event-manager.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-17 22:51:39 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-18 15:29:33 +0800
commit83bb1d62a578f41b8961c59cf805230b6ccc0e67 (patch)
tree13ae9638b0b4b85f7c4a2201f022cd726448da3d /src/empathy-event-manager.c
parent4c7bf004cedea3f3faca74ca9308ba826c3ecaab (diff)
downloadgsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.tar
gsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.tar.gz
gsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.tar.bz2
gsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.tar.lz
gsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.tar.xz
gsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.tar.zst
gsoc2013-empathy-83bb1d62a578f41b8961c59cf805230b6ccc0e67.zip
event-manager: use tp_user_action_time_from_x11()
Diffstat (limited to 'src/empathy-event-manager.c')
-rw-r--r--src/empathy-event-manager.c11
1 files changed, 4 insertions, 7 deletions
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)
{