diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-17 22:36:54 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-18 15:29:33 +0800 |
| commit | 682b70335bf789a60508f1d0b1b1ab119fc3f4dc (patch) | |
| tree | 82abbb22dcb1ec1ca69df633a8c7b630b83c62bc /src/empathy-event-manager.c | |
| parent | ea6b6013b18549e10cda58468b42e6fc732e6fcd (diff) | |
| download | gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.gz gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.bz2 gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.lz gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.xz gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.zst gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.zip | |
use TP_USER_ACTION_TIME_* (#627165)
Diffstat (limited to 'src/empathy-event-manager.c')
| -rw-r--r-- | src/empathy-event-manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index e678f990c..0dbb030b5 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -308,14 +308,14 @@ event_manager_approval_approve (EventManagerApproval *approval) if (approval->auto_approved) { - timestamp = EMPATHY_DISPATCHER_NON_USER_ACTION; + timestamp = TP_USER_ACTION_TIME_NOT_USER_ACTION; } else { timestamp = gtk_get_current_event_time (); if (timestamp == GDK_CURRENT_TIME) - timestamp = EMPATHY_DISPATCHER_CURRENT_TIME; + timestamp = TP_USER_ACTION_TIME_CURRENT_TIME; } g_assert (approval->operation != NULL); @@ -336,7 +336,7 @@ event_text_channel_process_func (EventPriv *event) EmpathyTpChat *tp_chat; gint64 timestamp = gtk_get_current_event_time (); if (timestamp == GDK_CURRENT_TIME) - timestamp = EMPATHY_DISPATCHER_CURRENT_TIME; + timestamp = TP_USER_ACTION_TIME_CURRENT_TIME; if (event->approval->handler != 0) { |