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:
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);
#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;
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);
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. */
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));
/* 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
/* 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);
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);
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)
{
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
{
empathy_dispatcher_join_muc (account,
empathy_chatroom_get_room (room),
- EMPATHY_DISPATCHER_NON_USER_ACTION);
+ TP_USER_ACTION_TIME_NOT_USER_ACTION);
}
}