From d8f3b21dbad75ba3704266f154061e8cf3b9539a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Sat, 17 Apr 2010 17:43:45 -0500 Subject: Remove /apps/evolution/calendar/date_navigator/show_week_numbers Signed-off-by: Federico Mena Quintero --- calendar/gui/apps_evolution_calendar.schemas.in | 14 -------------- calendar/gui/calendar-config-keys.h | 3 --- calendar/gui/dialogs/cal-prefs-dialog.c | 5 ----- modules/calendar/e-cal-shell-migrate.c | 2 +- modules/calendar/e-cal-shell-settings.c | 4 ---- 5 files changed, 1 insertion(+), 27 deletions(-) diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in index fb36e5b45b..c0c40ffadf 100644 --- a/calendar/gui/apps_evolution_calendar.schemas.in +++ b/calendar/gui/apps_evolution_calendar.schemas.in @@ -701,20 +701,6 @@ - - - - /schemas/apps/evolution/calendar/date_navigator/show_week_numbers - /apps/evolution/calendar/date_navigator/show_week_numbers - evolution-calendar - bool - false - - Show week numbers in date navigator - Whether to show week numbers in the date navigator. - - - diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h index cdff354859..568e211acf 100644 --- a/calendar/gui/calendar-config-keys.h +++ b/calendar/gui/calendar-config-keys.h @@ -58,9 +58,6 @@ G_BEGIN_DECLS #define CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST CALENDAR_CONFIG_PREFIX "/display/day_second_zones" #define CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX CALENDAR_CONFIG_PREFIX "/display/day_second_zones_max" -/* Date navigator settings */ -#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers" /* FMQ: remove */ - /* Task display settings */ #define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks" #define CALENDAR_CONFIG_PRIMARY_TASKS CALENDAR_CONFIG_PREFIX "/tasks/primary_tasks" diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 839374b464..00f381da44 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -735,11 +735,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, shell_settings, "cal-compress-weekend", widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no"); /* FMQ: remove */ - e_mutual_binding_new ( - shell_settings, "cal-show-week-numbers", - widget, "active"); - widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); /* FMQ: rename */ e_mutual_binding_new ( shell_settings, "cal-show-week-numbers", diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c index 0e5dee9363..f307522a9b 100644 --- a/modules/calendar/e-cal-shell-migrate.c +++ b/modules/calendar/e-cal-shell-migrate.c @@ -82,7 +82,7 @@ static e_gconf_map_t calendar_other_map[] = { static e_gconf_map_t calendar_datenavigator_map[] = { /* /Calendar/DateNavigator */ - { "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL }, + { "ShowWeekNumbers", "calendar/display/show_week_numbers", E_GCONF_MAP_BOOL }, { NULL }, }; diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index c2814dd3b1..4613f280bb 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -538,10 +538,6 @@ e_cal_shell_backend_init_settings (EShell *shell) "cal-show-event-end-times", "/apps/evolution/calendar/display/show_event_end"); - e_shell_settings_install_property_for_key ( - "cal-show-week-numbers", - "/apps/evolution/calendar/date_navigator/show_week_numbers"); - e_shell_settings_install_property_for_key ( "cal-tasks-color-due-today", "/apps/evolution/calendar/tasks/colors/due_today"); -- cgit v1.2.3