From fade26c2d60b3bde2dc84339382434e2f85ff68e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 30 Apr 2004 19:07:22 +0000 Subject: Remove default folders, shortcut stuff, and "show folder bar". * apps_evolution_shell.schemas.in.in: Remove default folders, shortcut stuff, and "show folder bar". * e-config-upgrade.c: Don't migrate those options either svn path=/trunk/; revision=25724 --- shell/ChangeLog | 7 ++ shell/apps_evolution_shell.schemas.in.in | 142 ------------------------------- shell/e-config-upgrade.c | 19 ----- 3 files changed, 7 insertions(+), 161 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 77bed4334f..8c4a593d78 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2004-04-30 Dan Winship + + * apps_evolution_shell.schemas.in.in: Remove default folders, + shortcut stuff, and "show folder bar". + + * e-config-upgrade.c: Don't migrate those options either + 2004-04-30 Dan Winship * e-shell-window-commands.c (command_quit): Don't save window diff --git a/shell/apps_evolution_shell.schemas.in.in b/shell/apps_evolution_shell.schemas.in.in index e58974edd2..e71bbb4537 100644 --- a/shell/apps_evolution_shell.schemas.in.in +++ b/shell/apps_evolution_shell.schemas.in.in @@ -13,102 +13,6 @@ - - - - /schemas/apps/evolution/shell/default_folders/mail_path - /apps/evolution/shell/default_folders/mail_path - evolution - string - evolution:/local/Inbox - - Path to the default mail folder - - - - - /schemas/apps/evolution/shell/default_folders/mail_uri - /apps/evolution/shell/default_folders/mail_uri - evolution - string - - - Physical URI to the default mail folder - - - - - - - /schemas/apps/evolution/shell/default_folders/contacts_path - /apps/evolution/shell/default_folders/contacts_path - evolution - string - evolution:/local/Contacts - - Path to the default contacts folder - - - - - /schemas/apps/evolution/shell/default_folders/contacts_uri - /apps/evolution/shell/default_folders/contacts_uri - evolution - string - - - Physical URI to the default contacts folder - - - - - - - /schemas/apps/evolution/shell/default_folders/calendar_path - /apps/evolution/shell/default_folders/calendar_path - evolution - string - evolution:/local/Calendar - - Path to the default calendar folder - - - - - /schemas/apps/evolution/shell/default_folders/calendar_uri - /apps/evolution/shell/default_folders/calendar_uri - evolution - string - - - Physical URI to the default calendar folder - - - - - - - /schemas/apps/evolution/shell/default_folders/tasks_path - /apps/evolution/shell/default_folders/tasks_path - evolution - string - evolution:/local/Tasks - - Path to the default tasks folder - - - - - /schemas/apps/evolution/shell/default_folders/tasks_uri - /apps/evolution/shell/default_folders/tasks_uri - evolution - string - - - Physical URI to the default tasks folder - - - @@ -179,39 +83,6 @@ - - /schemas/apps/evolution/shell/view_defaults/selected_shortcut_group - /apps/evolution/shell/view_defaults/selected_shortcut_group - evolution - int - 0 - - Default shortcut group - - - - - /schemas/apps/evolution/shell/view_defaults/show_folder_bar - /apps/evolution/shell/view_defaults/show_folder_bar - evolution - bool - false - - Whether to show the folder bar - - - - - /schemas/apps/evolution/shell/view_defaults/show_shortcut_bar - /apps/evolution/shell/view_defaults/show_shortcut_bar - evolution - bool - true - - Whether to show the shortcut bar - - - /schemas/apps/evolution/shell/view_defaults/component_id /apps/evolution/shell/view_defaults/component_id @@ -236,18 +107,5 @@ - - - - /schemas/apps/evolution/shell/view_defaults/shortcut_bar/width - /apps/evolution/shell/view_defaults/shortcut_bar/width - evolution - int - 100 - - Default width of the shortcut bar pane - - - diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 520a065c7c..8fb6674a3a 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -70,12 +70,7 @@ static e_gconf_map_t shell_views_map[] = { /* /Shell/Views/0 */ { "Width", "shell/view_defaults/width", E_GCONF_MAP_INT }, { "Height", "shell/view_defaults/height", E_GCONF_MAP_INT }, - { "CurrentShortcutsGroupNum", "shell/view_defaults/selected_shortcut_group", E_GCONF_MAP_INT }, - { "FolderBarShown", "shell/view_defaults/show_folder_bar", E_GCONF_MAP_BOOL }, - { "ShortcutBarShown", "shell/view_defaults/show_shortcut_bar", E_GCONF_MAP_BOOL }, - { "HPanedPosition", "shell/view_defaults/shortcut_bar/width", E_GCONF_MAP_INT }, { "ViewPanedPosition", "shell/view_defaults/folder_bar/width", E_GCONF_MAP_INT }, - { "DisplayedURI", "shell/view_defaults/folder_path", E_GCONF_MAP_STRING }, { 0 }, }; @@ -85,19 +80,6 @@ static e_gconf_map_t offlinefolders_map[] = { { 0 }, }; -static e_gconf_map_t defaultfolders_map[] = { - /* /DefaultFolders */ - { "mail_path", "shell/default_folders/mail_path", E_GCONF_MAP_STRING }, - { "mail_uri", "shell/default_folders/mail_uri", E_GCONF_MAP_STRING }, - { "contacts_path", "shell/default_folders/contacts_path", E_GCONF_MAP_STRING }, - { "contacts_uri", "shell/default_folders/contacts_uri", E_GCONF_MAP_STRING }, - { "calendar_path", "shell/default_folders/calendar_path", E_GCONF_MAP_STRING }, - { "calendar_uri", "shell/default_folders/calendar_uri", E_GCONF_MAP_STRING }, - { "tasks_path", "shell/default_folders/tasks_path", E_GCONF_MAP_STRING }, - { "tasks_uri", "shell/default_folders/tasks_uri", E_GCONF_MAP_STRING }, - { 0 }, -}; - static e_gconf_map_t shell_map[] = { /* /Shell */ { "StartOffline", "shell/start_offline", E_GCONF_MAP_BOOL }, @@ -135,7 +117,6 @@ e_gconf_map_list_t remap_list[] = { { "/Shell", shell_map }, { "/Shell/Views/0", shell_views_map }, { "/OfflineFolders", offlinefolders_map }, - { "/DefaultFolders", defaultfolders_map }, { "/Addressbook", addressbook_map }, { "/Addressbook/Completion", addressbook_completion_map }, -- cgit v1.2.3