diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2013-09-09 11:50:22 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2013-09-09 11:50:22 -0500 |
commit | 605e4b6391cb3f4f87e84ee63df9d50c60eea95c (patch) | |
tree | bf673742fac21e7ea293aa30894f01431b4ab5d7 /src/datetime-prefs-locations.c | |
parent | ecee96636e70894355aaee58675b1dbacd202ac9 (diff) | |
parent | b7f625ed8003197cd9d0a81240aea944860c8dc3 (diff) | |
download | ayatana-indicator-datetime-605e4b6391cb3f4f87e84ee63df9d50c60eea95c.tar.gz ayatana-indicator-datetime-605e4b6391cb3f4f87e84ee63df9d50c60eea95c.tar.bz2 ayatana-indicator-datetime-605e4b6391cb3f4f87e84ee63df9d50c60eea95c.zip |
sync with trunk
Diffstat (limited to 'src/datetime-prefs-locations.c')
-rw-r--r-- | src/datetime-prefs-locations.c | 5 |
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; |