diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-12 17:09:37 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-12 18:05:13 +0800 |
| commit | a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c (patch) | |
| tree | 010333d040b7a2c5352878c7ec53e645de96adc7 /src | |
| parent | f312b6f85b4128dffd08a5afc7797b7c204c7887 (diff) | |
| download | gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.gz gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.bz2 gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.lz gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.xz gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.tar.zst gsoc2013-empathy-a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 3 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 4 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.c | 4 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index e5444b6a4..f4a9f7e74 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1826,7 +1826,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; diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 2786e0738..00d2c8ab8 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -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); diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 0cef0e10f..0ac08c856 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1584,7 +1584,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, @@ -1595,7 +1595,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 diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 388a1e506..a09a5f710 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -683,8 +683,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); } diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index 50d3f8ace..100a6b9f1 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -2713,7 +2713,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)) { |