diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 21:37:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 21:37:26 +0800 |
| commit | 6843cf006192fecf2382b1dd87a2fb8531a34b5f (patch) | |
| tree | 385719873f29bdc6c90f536df9a87efc2700a2be /libempathy/empathy-time.c | |
| parent | a6eb75f8fddea5331c938c1ce42d08f962275f97 (diff) | |
| parent | a28c3a40ece7da5304ca084e1f30d26dbf006b56 (diff) | |
| download | gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.gz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.bz2 gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.lz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.xz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.zst gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.zip | |
Merge branch 'trivia'
Diffstat (limited to 'libempathy/empathy-time.c')
| -rw-r--r-- | libempathy/empathy-time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c index 19397e7a9..a39636dde 100644 --- a/libempathy/empathy-time.c +++ b/libempathy/empathy-time.c @@ -40,18 +40,18 @@ empathy_time_get_current (void) time_t empathy_time_get_local_time (struct tm *tm) { - const gchar *timezone; + const gchar *tz; time_t t; - timezone = g_getenv ("TZ"); + tz = g_getenv ("TZ"); g_setenv ("TZ", "", TRUE); tzset (); t = mktime (tm); - if (timezone) { - g_setenv ("TZ", timezone, TRUE); + if (tz) { + g_setenv ("TZ", tz, TRUE); } else { g_unsetenv ("TZ"); } |