From 19663dd8958f833385470c6d67f1d80923f33fd0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 30 Oct 2013 15:29:43 -0700 Subject: Add support for showing the year in indicator-datetime --- src/service.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/service.c') diff --git a/src/service.c b/src/service.c index 6fb2ded..0ed7d02 100644 --- a/src/service.c +++ b/src/service.c @@ -666,7 +666,8 @@ get_header_label_format_string (IndicatorDatetimeService * self) { gboolean show_day = g_settings_get_boolean (s, SETTINGS_SHOW_DAY_S); gboolean show_date = g_settings_get_boolean (s, SETTINGS_SHOW_DATE_S); - fmt = generate_full_format_string (show_day, show_date, s); + gboolean show_year = show_date && g_settings_get_boolean (s, SETTINGS_SHOW_YEAR_S); + fmt = generate_full_format_string (show_day, show_date, show_year, s); } p->header_label_format_string = fmt; @@ -1495,6 +1496,7 @@ on_desktop_settings_activated (GSimpleAction * a G_GNUC_UNUSED, #ifdef HAVE_CCPANEL execute_command ("gnome-control-center indicator-datetime"); #else +#error blah execute_command ("gnome-control-center datetime"); #endif } @@ -2182,6 +2184,7 @@ my_constructed (GObject * gself) SETTINGS_SHOW_SECONDS_S, SETTINGS_SHOW_DAY_S, SETTINGS_SHOW_DATE_S, + SETTINGS_SHOW_YEAR_S, SETTINGS_CUSTOM_TIME_FORMAT_S }; const char * const calendar_settings[] = { -- cgit v1.2.3