aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-04-18 06:43:45 +0800
committerFederico Mena Quintero <federico@novell.com>2010-04-18 07:01:06 +0800
commitd8f3b21dbad75ba3704266f154061e8cf3b9539a (patch)
treeea5b27f388a84895f175b8943f91bfd4a2d4ed9e
parent85fb57b9d8ec476dc8e75d10ae5481f4270dd9f2 (diff)
downloadgsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.tar
gsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.tar.gz
gsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.tar.bz2
gsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.tar.lz
gsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.tar.xz
gsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.tar.zst
gsoc2013-evolution-d8f3b21dbad75ba3704266f154061e8cf3b9539a.zip
Remove /apps/evolution/calendar/date_navigator/show_week_numbers
Signed-off-by: Federico Mena Quintero <federico@novell.com>
-rw-r--r--calendar/gui/apps_evolution_calendar.schemas.in14
-rw-r--r--calendar/gui/calendar-config-keys.h3
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c5
-rw-r--r--modules/calendar/e-cal-shell-migrate.c2
-rw-r--r--modules/calendar/e-cal-shell-settings.c4
5 files changed, 1 insertions, 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 @@
</locale>
</schema>
- <!-- Date navigator -->
-
- <schema>
- <key>/schemas/apps/evolution/calendar/date_navigator/show_week_numbers</key>
- <applyto>/apps/evolution/calendar/date_navigator/show_week_numbers</applyto>
- <owner>evolution-calendar</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Show week numbers in date navigator</short>
- <long>Whether to show week numbers in the date navigator.</long>
- </locale>
- </schema>
-
<!-- Alarm notification -->
<schema>
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
@@ -539,10 +539,6 @@ e_cal_shell_backend_init_settings (EShell *shell)
"/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");