[evolution] Bug 681877 - tzset() called too many times
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 681877 - tzset() called too many times
- Date: Wed, 18 Feb 2015 09:36:44 +0000 (UTC)
commit 013e7e073a8e97934a5d168d779904084fcc4fb6
Author: Milan Crha <mcrha redhat com>
Date: Wed Feb 18 10:36:12 2015 +0100
Bug 681877 - tzset() called too many times
e-util/e-datetime-format.c | 1 -
shell/main.c | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index b56a484..bb4918a 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -290,7 +290,6 @@ format_internal (const gchar *key,
struct tm today, value;
time_t ttoday;
- tzset ();
if (!tm_value) {
localtime_r (&tvalue, &value);
tm_value = &value;
diff --git a/shell/main.c b/shell/main.c
index 54335c1..ac8bf6b 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -436,13 +436,16 @@ main (gint argc,
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- /* do not require Gtk+ for --force-shutdown */
+ /* Do not require Gtk+ for --force-shutdown */
if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
shell_force_shutdown ();
return 0;
}
+ /* Initialize timezone specific global variables */
+ tzset ();
+
/* The contact maps feature uses clutter-gtk. */
#ifdef WITH_CONTACT_MAPS
/* XXX This function is declared in gtk-clutter-util.h with an
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]