aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-03-16 13:53:17 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-03-16 13:53:17 -0500
commitf281d28db0ae9985f0b0f05d90d8210b2651fd24 (patch)
tree67b10d9e6c0f7533f0ba778ffb4f72ae4759d48b /src
parent7e07badcd01e7d30933baa500a43b9cad7aa0205 (diff)
downloadayatana-indicator-datetime-f281d28db0ae9985f0b0f05d90d8210b2651fd24.tar.gz
ayatana-indicator-datetime-f281d28db0ae9985f0b0f05d90d8210b2651fd24.tar.bz2
ayatana-indicator-datetime-f281d28db0ae9985f0b0f05d90d8210b2651fd24.zip
minor: remove unnecessary nesting
Diffstat (limited to 'src')
-rw-r--r--src/datetime-service.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 4df2194..9c18d9b 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -821,12 +821,10 @@ update_appointment_menu_items (gpointer user_data)
apt_output = SETTINGS_TIME_12_HOUR;
} else if (g_strcmp0(time_format_str, "24-hour") == 0) {
apt_output = SETTINGS_TIME_24_HOUR;
+ } else if (is_locale_12h()) {
+ apt_output = SETTINGS_TIME_12_HOUR;
} else {
- if (is_locale_12h()) {
- apt_output = SETTINGS_TIME_12_HOUR;
- } else {
- apt_output = SETTINGS_TIME_24_HOUR;
- }
+ apt_output = SETTINGS_TIME_24_HOUR;
}
g_free (time_format_str);