From e46108042c88db357d67d82184738f72ad76f4be Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Wed, 31 Aug 2011 13:13:16 +1000 Subject: Use g_date_time_new_from_unix_local() to read timestamps from logger g_date_time_new_from_unix_local() reads a Unix timestamp (which is defined to be in UTC) and sets the timezone for the GDateTime to be the local timezone. Thus when we format it, we get times in local time. g_date_time_new_from_unix_utc() is not correct, because it sets the timezone to UTC. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=656189 --- libempathy-gtk/empathy-log-window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 6cdf22292..816013b73 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -1200,7 +1200,7 @@ get_parent_iter_for_message (TplEvent *event, GDateTime *date; gchar *body, *pretty_date; - date = g_date_time_new_from_unix_utc ( + date = g_date_time_new_from_unix_local ( tpl_event_get_timestamp (event)); pretty_date = g_date_time_format (date, @@ -1270,7 +1270,7 @@ log_window_append_chat_message (TplEvent *event, EmpathyStringParser *parsers; GString *msg; - date = g_date_time_new_from_unix_utc ( + date = g_date_time_new_from_unix_local ( tpl_event_get_timestamp (event)); pretty_date = g_date_time_format (date, "%X"); @@ -1347,7 +1347,7 @@ log_window_append_call (TplEvent *event, } } - started_date = g_date_time_new_from_unix_utc ( + started_date = g_date_time_new_from_unix_local ( tpl_event_get_timestamp (event)); pretty_date = g_date_time_format (started_date, -- cgit v1.2.3