From c81e028e66f6d574e6657f782d90493857192975 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sat, 7 Sep 2013 07:07:51 -0500
Subject: both service.c and utils.c have an enum for the time format mode, so
 share it in settings-shared.h

---
 src/utils.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/utils.c')

diff --git a/src/utils.c b/src/utils.c
index b99de94..5b1f58f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -348,14 +348,6 @@ get_full_date_format_string (gboolean show_day, gboolean show_date)
  *
  */
 
-enum
-{
-  SETTINGS_TIME_LOCALE = 0,
-  SETTINGS_TIME_12_HOUR = 1,
-  SETTINGS_TIME_24_HOUR = 2,
-  SETTINGS_TIME_CUSTOM = 3
-};
-
 const gchar *
 get_full_time_format_string (void)
 {
@@ -370,15 +362,16 @@ get_full_time_format_string (void)
 
   switch (g_settings_get_enum (settings, SETTINGS_TIME_FORMAT_S))
     {
-      case SETTINGS_TIME_LOCALE:
+      case TIME_FORMAT_MODE_LOCALE_DEFAULT:
         twelvehour = is_locale_12h();
         break;
 
-      case SETTINGS_TIME_24_HOUR:
+      case TIME_FORMAT_MODE_24_HOUR:
         twelvehour = FALSE;
         break;
 
-      default:
+      case TIME_FORMAT_MODE_12_HOUR:
+      case TIME_FORMAT_MODE_CUSTOM:
         twelvehour = TRUE;
         break;
     }
-- 
cgit v1.2.3


From e2096aa3f7d1a78ad0a8968a29529a6609a6fd5a Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sat, 7 Sep 2013 07:10:53 -0500
Subject: 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.

---
 src/utils.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/utils.c')

diff --git a/src/utils.c b/src/utils.c
index 5b1f58f..f8aa1f8 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -82,19 +82,18 @@ split_settings_location (const gchar * location, gchar ** zone, gchar ** name)
 }
 
 gchar *
-get_current_zone_name (const gchar * location)
+get_current_zone_name (const gchar * location, GSettings * settings)
 {
   gchar * new_zone, * new_name;
+  gchar * tz_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);
+  tz_name = g_settings_get_string (settings, 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
@@ -349,14 +348,13 @@ get_full_date_format_string (gboolean show_day, gboolean show_date)
  */
 
 const gchar *
-get_full_time_format_string (void)
+get_full_time_format_string (GSettings * settings)
 {
-  GSettings * settings;
   gboolean twelvehour;
   gboolean show_seconds;
   const gchar * fmt;
 
-  settings = g_settings_new (SETTINGS_INTERFACE);
+  g_return_val_if_fail (settings != NULL, NULL);
 
   show_seconds = g_settings_get_boolean (settings, SETTINGS_SHOW_SECONDS_S);
 
@@ -370,14 +368,11 @@ get_full_time_format_string (void)
         twelvehour = FALSE;
         break;
 
-      case TIME_FORMAT_MODE_12_HOUR:
-      case TIME_FORMAT_MODE_CUSTOM:
+      default:
         twelvehour = TRUE;
         break;
     }
 
-  g_object_unref (settings);
-
   if (twelvehour && show_seconds)
     /* TRANSLATORS: a strftime(3) format for 12hr time w/seconds */
     fmt = T_("%l:%M:%S %p");
@@ -395,19 +390,23 @@ get_full_time_format_string (void)
 }
 
 gchar *
-generate_full_format_string (gboolean show_day, gboolean show_date)
+generate_full_format_string (gboolean show_day, gboolean show_date, GSettings * settings)
 {
   const gchar * date_fmt = get_full_date_format_string (show_day, show_date);
-  const gchar * time_fmt = get_full_time_format_string ();
+  const gchar * time_fmt = get_full_time_format_string (settings);
   return join_date_and_time_format_strings (date_fmt, time_fmt);
 }
   
 gchar *
-generate_full_format_string_at_time (GDateTime * now, GDateTime * time)
+generate_full_format_string_at_time (GDateTime * now, GDateTime * time, GSettings * settings)
 {
   gboolean show_day;
   gboolean show_date;
 
+  g_return_val_if_fail (now != NULL, NULL);
+  g_return_val_if_fail (time != NULL, NULL);
+  g_return_val_if_fail (settings != NULL, NULL);
+
   switch (get_date_proximity (now, time))
     {
       case DATE_PROXIMITY_TODAY:
@@ -427,6 +426,6 @@ generate_full_format_string_at_time (GDateTime * now, GDateTime * time)
         break;
     }
 
-  return generate_full_format_string (show_day, show_date);
+  return generate_full_format_string (show_day, show_date, settings);
 }
 
-- 
cgit v1.2.3