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-chat-window.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-chat-window.c')
| -rw-r--r-- | src/empathy-chat-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 27d6dd874..c4b84fc1a 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1761,7 +1761,7 @@ chat_window_drag_data_received (GtkWidget *widget, /* Added to take care of any outstanding chat events */ empathy_chat_window_present_chat (chat, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); /* We should return TRUE to remove the data when doing * GDK_ACTION_MOVE, but we don't here otherwise it has @@ -2355,12 +2355,12 @@ empathy_chat_window_present_chat (EmpathyChat *chat, /* Don't force the window to show itself when it wasn't * an action by the user */ - if (timestamp == EMPATHY_DISPATCHER_NON_USER_ACTION) + if (timestamp == TP_USER_ACTION_TIME_NOT_USER_ACTION) return; priv = GET_PRIV (window); - if (timestamp == EMPATHY_DISPATCHER_CURRENT_TIME) { + if (timestamp == TP_USER_ACTION_TIME_CURRENT_TIME) { x_timestamp = GDK_CURRENT_TIME; } else { x_timestamp = CLAMP (timestamp, 0, G_MAXUINT32); |