Commit 839dbb28 authored by Guillaume Desmottes's avatar Guillaume Desmottes

Properly convert timestamps received from X11 (#650015)

X11 timestamps are guint32 while Telepathy uses gint64 timestamps. We should
always use tp_user_action_time_from_x11() to do the conversion.
parent 74ce4ee4
......@@ -737,7 +737,7 @@ empathy_chat_join_muc (EmpathyChat *chat,
EmpathyChatPriv *priv = GET_PRIV (chat);
empathy_join_muc (priv->account, room,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
static void
......@@ -808,7 +808,7 @@ chat_command_msg_internal (EmpathyChat *chat,
NULL);
req = tp_account_channel_request_new (priv->account, request,
tp_user_action_time_from_x11 (gtk_get_current_event_time ()));
empathy_get_current_action_time ());
/* FIXME: We should probably search in members alias. But this
* is enough for IRC */
......
......@@ -903,7 +903,7 @@ contact_list_view_row_activated (GtkTreeView *view,
if (contact) {
DEBUG ("Starting a chat");
empathy_chat_with_contact (contact,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
g_object_unref (contact);
}
}
......
......@@ -314,7 +314,7 @@ static void
empathy_contact_chat_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_chat_with_contact (contact, gtk_get_current_event_time ());
empathy_chat_with_contact (contact, empathy_get_current_action_time ());
}
GtkWidget *
......@@ -343,9 +343,8 @@ static void
empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_call_new_with_streams (contact, TRUE, FALSE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......@@ -376,7 +375,7 @@ empathy_contact_video_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_call_new_with_streams (contact, TRUE, TRUE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......
......@@ -499,7 +499,7 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item,
{
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_chat_with_contact (contact, gtk_get_current_event_time ());
empathy_chat_with_contact (contact, empathy_get_current_action_time ());
}
GtkWidget *
......@@ -543,7 +543,7 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_call_new_with_streams (contact, TRUE, FALSE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......@@ -585,7 +585,7 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_call_new_with_streams (contact, TRUE, TRUE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......
......@@ -134,7 +134,8 @@ empathy_new_call_dialog_response (GtkDialog *dialog, int response_id)
* we return from this function. */
video = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->check_video));
call_contact (account, contact_id, video, gtk_get_current_event_time ());
call_contact (account, contact_id, video,
empathy_get_current_action_time ());
out:
gtk_widget_destroy (GTK_WIDGET (dialog));
......
......@@ -76,7 +76,7 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
if (EMP_STR_EMPTY (contact_id) || account == NULL) goto out;
empathy_chat_with_contact_id (account, contact_id,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
out:
gtk_widget_destroy (GTK_WIDGET (dialog));
......
......@@ -1786,7 +1786,7 @@ chat_window_drag_data_received (GtkWidget *widget,
if (!chat) {
empathy_chat_with_contact_id (
account, contact_id, gtk_get_current_event_time ());
account, contact_id, empathy_get_current_action_time ());
g_strfreev (strv);
return;
......
......@@ -43,6 +43,7 @@
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-contact-dialogs.h>
#include <libempathy-gtk/empathy-sound-manager.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-event-manager.h"
#include "empathy-main-window.h"
......@@ -316,7 +317,7 @@ event_manager_approval_approve (EventManagerApproval *approval)
}
else
{
timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ());
timestamp = empathy_get_current_action_time ();
}
g_assert (approval->operation != NULL);
......
......@@ -1253,7 +1253,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
join_fav_account_sig_ctx *ctx;
ctx = join_fav_account_sig_ctx_new (account, chatroom,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
ctx->sig_id = g_signal_connect_data (account, "status-changed",
G_CALLBACK (account_status_changed_cb), ctx,
......@@ -1264,7 +1264,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
return;
}
join_chatroom (chatroom, gtk_get_current_event_time ());
join_chatroom (chatroom, empathy_get_current_action_time ());
}
static void
......
......@@ -690,8 +690,8 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog)
g_strstrip (room_name);
DEBUG ("Requesting channel for '%s'", room_name);
empathy_join_muc (account, room_name,
gtk_get_current_event_time ());
empathy_join_muc (account, room_name, empathy_get_current_action_time ());
g_free (room_name);
}
......
......@@ -2709,7 +2709,7 @@ start_call (EmpathyStreamedMediaWindow *self)
priv->call_started = TRUE;
empathy_streamed_media_handler_start_call (priv->handler,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
if (empathy_streamed_media_handler_has_initial_video (priv->handler))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment