diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-09-29 16:43:39 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-09-29 16:43:39 -0400 |
| commit | 31bf779fb487a859ff21910a652faeae2f116b63 (patch) | |
| tree | 3d1cfc3904bb3e0e7a2a92c1a28520c3a1301e15 /src/utils.c | |
| parent | 95fcdc5a0e1e2d4184149e2354f0cb33d6755d48 (diff) | |
| parent | e569f3e9744146d5e9d3bfee21092def7350043b (diff) | |
| download | ayatana-indicator-datetime-31bf779fb487a859ff21910a652faeae2f116b63.tar.gz ayatana-indicator-datetime-31bf779fb487a859ff21910a652faeae2f116b63.tar.bz2 ayatana-indicator-datetime-31bf779fb487a859ff21910a652faeae2f116b63.zip | |
* New upstream release.
* Fix corrupt environment when LANGUAGE not set (LP: #861123)
* Measure string size with GLib (LP: #730476)
* Free ECals when they have errors (LP: #774071)
* Fix untranslated string (LP: #853130)
Diffstat (limited to 'src/utils.c')
| -rw-r--r-- | src/utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/utils.c b/src/utils.c index 73c8ab2..e6de92a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -161,7 +161,8 @@ T_(const char *msg) char *time_locale = g_strdup(setlocale(LC_TIME, NULL)); char *language = g_strdup(g_getenv("LANGUAGE")); char *rv; - g_unsetenv("LANGUAGE"); + if (language) + g_unsetenv("LANGUAGE"); setlocale(LC_MESSAGES, time_locale); /* Get the LC_TIME version */ @@ -169,7 +170,8 @@ T_(const char *msg) /* Put everything back the way it was */ setlocale(LC_MESSAGES, message_locale); - g_setenv("LANGUAGE", language, TRUE); + if (language) + g_setenv("LANGUAGE", language, TRUE); g_free(message_locale); g_free(time_locale); g_free(language); |