aboutsummaryrefslogtreecommitdiff
path: root/src/utils.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-04-07 13:11:16 -0500
committerTed Gould <ted@gould.cx>2011-04-07 13:11:16 -0500
commit0ad5499029f0ad9f718453b43e96833f433608bb (patch)
tree379dae777ab96a0b9c903de749aad53323f5fb55 /src/utils.c
parent01d3c313140e77d961378b332d52e3a93ce691c5 (diff)
parent20aee32a693b5fa78f1a3547351a9fb316534935 (diff)
downloadayatana-indicator-datetime-0ad5499029f0ad9f718453b43e96833f433608bb.tar.gz
ayatana-indicator-datetime-0ad5499029f0ad9f718453b43e96833f433608bb.tar.bz2
ayatana-indicator-datetime-0ad5499029f0ad9f718453b43e96833f433608bb.zip
Set timezone from the menuitems in the indicator
Diffstat (limited to 'src/utils.c')
-rw-r--r--src/utils.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/src/utils.c b/src/utils.c
index d8851aa..ab93ecf 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -81,6 +81,42 @@ split_settings_location (const gchar * location, gchar ** zone, gchar ** name)
}
}
+gchar *
+get_current_zone_name (const gchar * location)
+{
+ gchar * new_zone, * new_name;
+ gchar * old_zone, * old_name;
+ gchar * rv;
+
+ split_settings_location (location, &new_zone, &new_name);
+
+ GSettings * conf = g_settings_new (SETTINGS_INTERFACE);
+ gchar * tz_name = g_settings_get_string (conf, SETTINGS_TIMEZONE_NAME_S);
+ split_settings_location (tz_name, &old_zone, &old_name);
+ g_free (tz_name);
+ g_object_unref (conf);
+
+ // new_name is always just a sanitized version of a timezone.
+ // old_name is potentially a saved "pretty" version of a timezone name from
+ // geonames. So we prefer to use it if available and the zones match.
+
+ if (g_strcmp0 (old_zone, new_zone) == 0) {
+ rv = old_name;
+ old_name = NULL;
+ }
+ else {
+ rv = new_name;
+ new_name = NULL;
+ }
+
+ g_free (new_zone);
+ g_free (old_zone);
+ g_free (new_name);
+ g_free (old_name);
+
+ return rv;
+}
+
/* Translate msg according to the locale specified by LC_TIME */
static char *
T_(const char *msg)