diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-09-01 09:00:08 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-09-01 09:00:08 +0800 |
| commit | 73e8667395282bda229c900425221ee0f35560ab (patch) | |
| tree | ed93327b3b9893e8eed82609fdbc1209a4a242de | |
| parent | 1da2ae694517fc48cb8e49d5a030a8d95554701d (diff) | |
| parent | e46108042c88db357d67d82184738f72ad76f4be (diff) | |
| download | gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.tar gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.tar.gz gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.tar.bz2 gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.tar.lz gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.tar.xz gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.tar.zst gsoc2013-empathy-73e8667395282bda229c900425221ee0f35560ab.zip | |
Merge branch 'timezones-656189'
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 6 |
1 files 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, |