remove calendar and task keys for upgrade, its done in the calendar now

2004-01-15  JP Rosevear <jpr@ximian.com>

	* e-config-upgrade.c: remove calendar and task keys for upgrade,
	its done in the calendar now

svn path=/trunk/; revision=24247

2 files changed, 5 insertions, 68 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2941106992..67ed71c0a8 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-15  JP Rosevear <jpr@ximian.com>
+
+	* e-config-upgrade.c: remove calendar and task keys for upgrade,
+	its done in the calendar now
+
 2004-01-15  Rodrigo Moya <rodrigo@ximian.com>
 
 	* e-shell-view-menu.c: added ForgetPasswords menu item.
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index e59c7e9264..520a065c7c 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -120,67 +120,6 @@ static e_gconf_map_t addressbook_completion_map[] = {
 
 /* ********************************************************************** */
 
-static e_gconf_map_t calendar_display_map[] = {
-	/* /Calendar/Display */
-	{ "Timezone", "calendar/display/timezone", E_GCONF_MAP_STRING },
-	{ "Use24HourFormat", "calendar/display/use_24hour_format", E_GCONF_MAP_BOOL },
-	{ "WeekStartDay", "calendar/display/week_start_day", E_GCONF_MAP_INT },
-	{ "DayStartHour", "calendar/display/day_start_hour", E_GCONF_MAP_INT },
-	{ "DayStartMinute", "calendar/display/day_start_minute", E_GCONF_MAP_INT },
-	{ "DayEndHour", "calendar/display/day_end_hour", E_GCONF_MAP_INT },
-	{ "DayEndMinute", "calendar/display/day_end_minute", E_GCONF_MAP_INT },
-	{ "TimeDivisions", "calendar/display/time_divisions", E_GCONF_MAP_INT },
-	{ "View", "calendar/display/default_view", E_GCONF_MAP_INT },
-	{ "HPanePosition", "calendar/display/hpane_position", E_GCONF_MAP_FLOAT },
-	{ "VPanePosition", "calendar/display/vpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthHPanePosition", "calendar/display/month_hpane_position", E_GCONF_MAP_FLOAT },
-	{ "MonthVPanePosition", "calendar/display/month_vpane_position", E_GCONF_MAP_FLOAT },
-	{ "CompressWeekend", "calendar/display/compress_weekend", E_GCONF_MAP_BOOL },
-	{ "ShowEventEndTime", "calendar/display/show_event_end", E_GCONF_MAP_BOOL },
-	{ "WorkingDays", "calendar/display/working_days", E_GCONF_MAP_INT },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_tasks_map[] = {
-	/* /Calendar/Tasks */
-	{ "HideCompletedTasks", "calendar/tasks/hide_completed", E_GCONF_MAP_BOOL },
-	{ "HideCompletedTasksUnits", "calendar/tasks/hide_completed_units", E_GCONF_MAP_STRING },
-	{ "HideCompletedTasksValue", "calendar/tasks/hide_completed_value", E_GCONF_MAP_INT },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_tasks_colours_map[] = {
-	/* /Calendar/Tasks/Colors */
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ "TasksOverDue", "calendar/tasks/colors/overdue", E_GCONF_MAP_STRING },
-	{ "TasksDueToday", "calendar/tasks/colors/due_today", E_GCONF_MAP_STRING },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_other_map[] = {
-	/* /Calendar/Other */
-	{ "ConfirmDelete", "calendar/prompts/confirm_delete", E_GCONF_MAP_BOOL },
-	{ "ConfirmExpunge", "calendar/prompts/confirm_expunge", E_GCONF_MAP_BOOL },
-	{ "UseDefaultReminder", "calendar/other/use_default_reminder", E_GCONF_MAP_BOOL },
-	{ "DefaultReminderInterval", "calendar/other/default_reminder_interval", E_GCONF_MAP_INT },
-	{ "DefaultReminderUnits", "calendar/other/default_reminder_units", E_GCONF_MAP_STRING },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_datenavigator_map[] = {
-	/* /Calendar/DateNavigator */
-	{ "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL },
-	{ 0 },
-};
-
-static e_gconf_map_t calendar_alarmnotify_map[] = {
-	/* /Calendar/AlarmNotify */
-	{ "LastNotificationTime", "calendar/notify/last_notification_time", E_GCONF_MAP_INT },
-	{ "CalendarToLoad%i", "calendar/notify/calendars", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ "BlessedProgram%i", "calendar/notify/programs", E_GCONF_MAP_STRING|E_GCONF_MAP_LIST },
-	{ 0 },
-};
-
 static e_gconf_map_t general_map[] = {
 	/* /General */
 	{ "CategoryMasterList", "general/category_master_list", E_GCONF_MAP_STRING }
@@ -201,13 +140,6 @@ e_gconf_map_list_t remap_list[] = {
 	{ "/Addressbook", addressbook_map },
 	{ "/Addressbook/Completion", addressbook_completion_map },
 
-	{ "/Calendar/Display", calendar_display_map },
-	{ "/Calendar/Tasks", calendar_tasks_map },
-	{ "/Calendar/Tasks/Colors", calendar_tasks_colours_map },
-	{ "/Calendar/Other/Map", calendar_other_map },
-	{ "/Calendar/DateNavigator", calendar_datenavigator_map },
-	{ "/Calendar/AlarmNotify", calendar_alarmnotify_map },
-
 	{ "/General", general_map },
 
 	{ 0 },