aboutsummaryrefslogtreecommitdiff
path: root/panel
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-10-31 00:13:17 +0000
committerTarmac <Unknown>2013-10-31 00:13:17 +0000
commitb5ed574ecd4f8a1c84f0a0272bda4b0509877eae (patch)
tree0975152aae9c159e23f3cccb5d05fcf0137d8f2e /panel
parentbbc781d9e2afe500d9a5d09335f0954f25269be6 (diff)
parent668658f383ae43f175a70a0fdca983c64b84fe59 (diff)
downloadayatana-indicator-datetime-b5ed574ecd4f8a1c84f0a0272bda4b0509877eae.tar.gz
ayatana-indicator-datetime-b5ed574ecd4f8a1c84f0a0272bda4b0509877eae.tar.bz2
ayatana-indicator-datetime-b5ed574ecd4f8a1c84f0a0272bda4b0509877eae.zip
As per the spec, let users show the year in indicator-datetime. Fixes: https://bugs.launchpad.net/bugs/465689.
Approved by Ted Gould, PS Jenkins bot.
Diffstat (limited to 'panel')
-rw-r--r--panel/datetime-prefs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/panel/datetime-prefs.c b/panel/datetime-prefs.c
index 8e5ee35..55456ac 100644
--- a/panel/datetime-prefs.c
+++ b/panel/datetime-prefs.c
@@ -699,7 +699,9 @@ indicator_datetime_panel_init (IndicatorDatetimePanel * self)
"active", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (conf, SETTINGS_SHOW_DAY_S, WIG ("showWeekdayCheck"),
"active", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (conf, SETTINGS_SHOW_DATE_S, WIG ("showDateTimeCheck"),
+ g_settings_bind (conf, SETTINGS_SHOW_DATE_S, WIG ("showDateAndMonthCheck"),
+ "active", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (conf, SETTINGS_SHOW_YEAR_S, WIG ("showYearCheck"),
"active", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (conf, SETTINGS_SHOW_SECONDS_S, WIG ("showSecondsCheck"),
"active", G_SETTINGS_BIND_DEFAULT);
@@ -725,6 +727,7 @@ indicator_datetime_panel_init (IndicatorDatetimePanel * self)
"active", G_SETTINGS_BIND_DEFAULT);
/* Set up sensitivities */
+ add_widget_dependency (WIG ("showDateAndMonthCheck"), WIG ("showYearCheck"));
add_widget_dependency (WIG ("showCalendarCheck"), WIG ("calendarOptions"));
add_widget_dependency (WIG ("showClockCheck"), WIG ("clockOptions"));
add_widget_dependency (WIG ("showLocationsCheck"), WIG ("locationsButton"));