Revert "util: cache local GTimeZone"

This reverts commit f597a0a11c.
This commit is contained in:
Christian Hergert 2020-02-26 23:43:25 -08:00
parent 5ccf92e804
commit b48e95cba2
4 changed files with 1 additions and 34 deletions

View File

@ -573,11 +573,6 @@ var DateMenuButton = new Lang.Class({
// https://bugzilla.gnome.org/show_bug.cgi?id=678507 // https://bugzilla.gnome.org/show_bug.cgi?id=678507
System.clearDateCaches(); System.clearDateCaches();
// To reduce the number of times that Shell opens /etc/localtime on
// the main thread to parse timezone info, we cache the result. That
// needs to be cleared when we change timezones.
Shell.util_clear_timezone_cache();
this._calendar.updateTimeZone(); this._calendar.updateTimeZone();
}, },

View File

@ -118,7 +118,7 @@ function init() {
// Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
Date.prototype.toLocaleFormat = function(format) { Date.prototype.toLocaleFormat = function(format) {
return Shell.util_format_now(format); return Shell.util_format_date(format, this.getTime());
}; };
let slowdownEnv = GLib.getenv('GNOME_SHELL_SLOWDOWN_FACTOR'); let slowdownEnv = GLib.getenv('GNOME_SHELL_SLOWDOWN_FACTOR');

View File

@ -20,8 +20,6 @@
#include <langinfo.h> #include <langinfo.h>
#endif #endif
static GTimeZone *local_tz;
static void static void
stop_pick (ClutterActor *actor, stop_pick (ClutterActor *actor,
const ClutterColor *color) const ClutterColor *color)
@ -156,30 +154,6 @@ shell_util_format_date (const char *format,
return result; return result;
} }
char *
shell_util_format_now (const char *format)
{
GDateTime *datetime;
char *ret;
if (local_tz == NULL)
local_tz = g_time_zone_new_local ();
datetime = g_date_time_new_now (local_tz);
if (!datetime)
return g_strdup ("");
ret = g_date_time_format (datetime, format);
g_date_time_unref (datetime);
return ret;
}
void
shell_util_clear_timezone_cache (void)
{
g_clear_pointer (&local_tz, g_time_zone_unref);
}
/** /**
* shell_util_get_week_start: * shell_util_get_week_start:
* *

View File

@ -22,8 +22,6 @@ int shell_util_get_week_start (void);
char *shell_util_format_date (const char *format, char *shell_util_format_date (const char *format,
gint64 time_ms); gint64 time_ms);
char *shell_util_format_now (const char *format);
void shell_util_clear_timezone_cache (void);
const char *shell_util_translate_time_string (const char *str); const char *shell_util_translate_time_string (const char *str);
char *shell_util_regex_escape (const char *str); char *shell_util_regex_escape (const char *str);