diff options
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-share-my-desktop.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.h | 3 | ||||
| -rw-r--r-- | libempathy/empathy-ft-handler.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 2 | ||||
| -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 |
9 files changed, 15 insertions, 18 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 45faea4fb..15da94c81 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -241,11 +241,11 @@ account_reconnected (EmpathyChat *chat, switch (priv->handle_type) { case TP_HANDLE_TYPE_CONTACT: empathy_dispatcher_chat_with_contact_id ( - account, priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); + account, priv->id, TP_USER_ACTION_TIME_NOT_USER_ACTION); break; case TP_HANDLE_TYPE_ROOM: empathy_dispatcher_join_muc (account, priv->id, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); break; case TP_HANDLE_TYPE_NONE: case TP_HANDLE_TYPE_LIST: diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index a630fc2a5..01a885ada 100644 --- a/libempathy-gtk/empathy-share-my-desktop.c +++ b/libempathy-gtk/empathy-share-my-desktop.c @@ -77,7 +77,7 @@ empathy_share_my_desktop_share_with_contact (EmpathyContact *contact) NULL); req = tp_account_channel_request_new (empathy_contact_get_account (contact), - request, EMPATHY_DISPATCHER_CURRENT_TIME); + request, TP_USER_ACTION_TIME_CURRENT_TIME); tp_account_channel_request_create_channel_async (req, NULL, NULL, create_tube_channel_cb, NULL); diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h index bf6e169b7..cd54fa5d1 100644 --- a/libempathy/empathy-dispatcher.h +++ b/libempathy/empathy-dispatcher.h @@ -38,9 +38,6 @@ G_BEGIN_DECLS #define EMPATHY_IS_DISPATCHER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_DISPATCHER)) #define EMPATHY_DISPATCHER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_DISPATCHER, EmpathyDispatcherClass)) -#define EMPATHY_DISPATCHER_NON_USER_ACTION (G_GINT64_CONSTANT (0)) -#define EMPATHY_DISPATCHER_CURRENT_TIME G_MAXINT64 - typedef struct _EmpathyDispatcher EmpathyDispatcher; typedef struct _EmpathyDispatcherClass EmpathyDispatcherClass; diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 13568cef9..f18278a71 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -761,7 +761,7 @@ ft_handler_push_to_dispatcher (EmpathyFTHandler *handler) account = empathy_contact_get_account (priv->contact); req = tp_account_channel_request_new (account, priv->request, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); tp_account_channel_request_create_and_handle_channel_async (req, NULL, ft_handler_create_channel_cb, handler); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 2fd6fc506..6f4874fc8 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -167,7 +167,7 @@ tp_chat_add (EmpathyContactList *list, NULL); req = tp_account_channel_request_new (priv->account, props, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); /* Although this is a MUC, it's anonymous, so CreateChannel is * valid. */ 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); } } |