diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/apps_evolution_shell.schemas.in.in | 142 | ||||
| -rw-r--r-- | shell/e-config-upgrade.c | 19 |
3 files changed, 7 insertions, 161 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 77bed4334f..8c4a593d78 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,12 @@ 2004-04-30 Dan Winship <danw@ximian.com> + * 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 <danw@ximian.com> + * e-shell-window-commands.c (command_quit): Don't save window state here. 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 @@ </locale> </schema> - <!-- Default mail folder --> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/mail_path</key> - <applyto>/apps/evolution/shell/default_folders/mail_path</applyto> - <owner>evolution</owner> - <type>string</type> - <default>evolution:/local/Inbox</default> - <locale name="C"> - <short>Path to the default mail folder</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/mail_uri</key> - <applyto>/apps/evolution/shell/default_folders/mail_uri</applyto> - <owner>evolution</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Physical URI to the default mail folder</short> - </locale> - </schema> - - <!-- Default contacts folder --> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/contacts_path</key> - <applyto>/apps/evolution/shell/default_folders/contacts_path</applyto> - <owner>evolution</owner> - <type>string</type> - <default>evolution:/local/Contacts</default> - <locale name="C"> - <short>Path to the default contacts folder</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/contacts_uri</key> - <applyto>/apps/evolution/shell/default_folders/contacts_uri</applyto> - <owner>evolution</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Physical URI to the default contacts folder</short> - </locale> - </schema> - - <!-- Default calendar folder --> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/calendar_path</key> - <applyto>/apps/evolution/shell/default_folders/calendar_path</applyto> - <owner>evolution</owner> - <type>string</type> - <default>evolution:/local/Calendar</default> - <locale name="C"> - <short>Path to the default calendar folder</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/calendar_uri</key> - <applyto>/apps/evolution/shell/default_folders/calendar_uri</applyto> - <owner>evolution</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Physical URI to the default calendar folder</short> - </locale> - </schema> - - <!-- Default tasks folder --> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/tasks_path</key> - <applyto>/apps/evolution/shell/default_folders/tasks_path</applyto> - <owner>evolution</owner> - <type>string</type> - <default>evolution:/local/Tasks</default> - <locale name="C"> - <short>Path to the default tasks folder</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/shell/default_folders/tasks_uri</key> - <applyto>/apps/evolution/shell/default_folders/tasks_uri</applyto> - <owner>evolution</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Physical URI to the default tasks folder</short> - </locale> - </schema> - <!-- Development warning dialog --> <schema> @@ -180,39 +84,6 @@ </schema> <schema> - <key>/schemas/apps/evolution/shell/view_defaults/selected_shortcut_group</key> - <applyto>/apps/evolution/shell/view_defaults/selected_shortcut_group</applyto> - <owner>evolution</owner> - <type>int</type> - <default>0</default> - <locale name="C"> - <short>Default shortcut group</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/shell/view_defaults/show_folder_bar</key> - <applyto>/apps/evolution/shell/view_defaults/show_folder_bar</applyto> - <owner>evolution</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Whether to show the folder bar</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/shell/view_defaults/show_shortcut_bar</key> - <applyto>/apps/evolution/shell/view_defaults/show_shortcut_bar</applyto> - <owner>evolution</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Whether to show the shortcut bar</short> - </locale> - </schema> - - <schema> <key>/schemas/apps/evolution/shell/view_defaults/component_id</key> <applyto>/apps/evolution/shell/view_defaults/component_id</applyto> <owner>evolution</owner> @@ -236,18 +107,5 @@ </locale> </schema> - <!-- Shortcut bar --> - - <schema> - <key>/schemas/apps/evolution/shell/view_defaults/shortcut_bar/width</key> - <applyto>/apps/evolution/shell/view_defaults/shortcut_bar/width</applyto> - <owner>evolution</owner> - <type>int</type> - <default>100</default> - <locale name="C"> - <short>Default width of the shortcut bar pane</short> - </locale> - </schema> - </schemalist> </gconfschemafile> 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 }, |