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.

6 files changed, 14 insertions, 14 deletions

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index b580812ac..8ce698f02 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -753,7 +753,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
@@ -824,7 +824,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 */
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index dace4f909..03839abbe 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -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);
 	}
 }
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 15f47b206..ecdbee1ba 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -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 *
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 576d3b9fa..4a0b45cab 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -518,7 +518,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 *
@@ -564,7 +564,7 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
   empathy_sms_contact_id (
       empathy_contact_get_account (contact),
       empathy_contact_get_id (contact),
-      gtk_get_current_event_time ());
+      empathy_get_current_action_time ());
 }
 
 GtkWidget *
@@ -608,7 +608,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 *
@@ -650,7 +650,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 *
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index fbff2770e..86430cd24 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -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));
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 3d811abbb..f3186ccf9 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -85,12 +85,12 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
     {
       case EMP_NEW_MESSAGE_TEXT:
         empathy_chat_with_contact_id (account, contact_id,
-            gtk_get_current_event_time ());
+            empathy_get_current_action_time ());
         break;
 
       case EMP_NEW_MESSAGE_SMS:
         empathy_sms_contact_id (account, contact_id,
-            gtk_get_current_event_time ());
+            empathy_get_current_action_time ());
         break;
 
       default: