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 | |
| 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')
| -rw-r--r-- | src/empathy-chat-manager.c | 4 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 6 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 6 | ||||
| -rw-r--r-- | src/empathy.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index fdc4451dd..cfa38ec84 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -385,10 +385,10 @@ empathy_chat_manager_undo_closed_chat (EmpathyChatManager *self) if (data->room) empathy_dispatcher_join_muc (data->account, data->id, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); else empathy_dispatcher_chat_with_contact_id (data->account, data->id, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); g_signal_emit (self, signals[CHATS_CHANGED], 0, g_queue_get_length (priv->queue)); 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); 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) { diff --git a/src/empathy.c b/src/empathy.c index fc780fac0..0128b7b00 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -301,7 +301,7 @@ account_status_changed_cb (TpAccount *account, return; empathy_dispatcher_join_muc (account, - empathy_chatroom_get_room (room), EMPATHY_DISPATCHER_NON_USER_ACTION); + empathy_chatroom_get_room (room), TP_USER_ACTION_TIME_NOT_USER_ACTION); } static void @@ -350,7 +350,7 @@ account_manager_chatroom_ready_cb (GObject *source_object, { empathy_dispatcher_join_muc (account, empathy_chatroom_get_room (room), - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); } } |