aboutsummaryrefslogtreecommitdiff
path: root/src/datetime-prefs-locations.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-09-07 07:10:53 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-09-07 07:10:53 -0500
commite2096aa3f7d1a78ad0a8968a29529a6609a6fd5a (patch)
tree9dbdb8a38ff258ccb7faaaaeaed3d73c13ae45e1 /src/datetime-prefs-locations.c
parentc81e028e66f6d574e6657f782d90493857192975 (diff)
downloadayatana-indicator-datetime-e2096aa3f7d1a78ad0a8968a29529a6609a6fd5a.tar.gz
ayatana-indicator-datetime-e2096aa3f7d1a78ad0a8968a29529a6609a6fd5a.tar.bz2
ayatana-indicator-datetime-e2096aa3f7d1a78ad0a8968a29529a6609a6fd5a.zip
in the utils functions, add a GSettings argument for the functions that use a GSettings s.t. they don't have to keep reloading settings in a temporary every time they're called.
Diffstat (limited to 'src/datetime-prefs-locations.c')
-rw-r--r--src/datetime-prefs-locations.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/datetime-prefs-locations.c b/src/datetime-prefs-locations.c
index bc044a2..ca3d9b5 100644
--- a/src/datetime-prefs-locations.c
+++ b/src/datetime-prefs-locations.c
@@ -417,6 +417,7 @@ update_times (GtkWidget * dlg)
g_signal_handlers_block_by_func (store, save_when_idle, dlg);
+ GSettings * settings = g_settings_new (SETTINGS_INTERFACE);
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
GDateTime * now = g_date_time_new_now_local ();
@@ -428,7 +429,7 @@ update_times (GtkWidget * dlg)
if (strzone && *strzone) {
GTimeZone * tz = g_time_zone_new (strzone);
GDateTime * now_tz = g_date_time_to_timezone (now, tz);
- gchar * format = generate_full_format_string_at_time (now, now_tz);
+ gchar * format = generate_full_format_string_at_time (now, now_tz, settings);
gchar * time_str = g_date_time_format (now_tz, format);
gchar * old_time_str;
@@ -447,6 +448,8 @@ update_times (GtkWidget * dlg)
g_date_time_unref (now);
}
+ g_object_unref (settings);
+
g_signal_handlers_unblock_by_func (store, save_when_idle, dlg);
return TRUE;