diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-09-07 07:07:51 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-09-07 07:07:51 -0500 |
| commit | c81e028e66f6d574e6657f782d90493857192975 (patch) | |
| tree | 99930c03ff97c3618032a680a2462b75b130fb2d /src/utils.c | |
| parent | fd1d19cbdc2d29d8ada8a304221cabf6cac95e7a (diff) | |
| download | ayatana-indicator-datetime-c81e028e66f6d574e6657f782d90493857192975.tar.gz ayatana-indicator-datetime-c81e028e66f6d574e6657f782d90493857192975.tar.bz2 ayatana-indicator-datetime-c81e028e66f6d574e6657f782d90493857192975.zip | |
both service.c and utils.c have an enum for the time format mode, so share it in settings-shared.h
Diffstat (limited to 'src/utils.c')
| -rw-r--r-- | src/utils.c | 15 |
1 files changed, 4 insertions, 11 deletions
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; } |