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