From 7e07badcd01e7d30933baa500a43b9cad7aa0205 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 13:52:30 -0500 Subject: plug a string leak when updating appointments --- src/datetime-service.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index a782d80..4df2194 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -828,6 +828,7 @@ update_appointment_menu_items (gpointer user_data) apt_output = SETTINGS_TIME_24_HOUR; } } + g_free (time_format_str); GVariantBuilder markeddays; g_variant_builder_init (&markeddays, G_VARIANT_TYPE ("ai")); -- cgit v1.2.3 From f281d28db0ae9985f0b0f05d90d8210b2651fd24 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 13:53:17 -0500 Subject: minor: remove unnecessary nesting --- src/datetime-service.c | 8 +++----- 1 file 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); -- cgit v1.2.3