diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-setup.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 9747a87cc4..790a58a69c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2001-07-10 Jason Leach <jleach@ximian.com> + + * e-setup.c (copy_default_stuff): Add a temporary block of code to + not use the $GNOME/share/evolution/default_user/shortcuts.xml for + users who might be upgrading, so they'll get the shell-generated + default set of shortcuts. See notes on #4394. + 2001-07-09 Larry Ewing <lewing@ximian.com> * e-shell-folder-commands.c (delete_dialog): convert the folder diff --git a/shell/e-setup.c b/shell/e-setup.c index 6f8d565056..a25f7d5187 100644 --- a/shell/e-setup.c +++ b/shell/e-setup.c @@ -191,6 +191,7 @@ copy_default_stuff (const char *evolution_directory) gboolean retval; char *command; int result; + char *old_default_shortcuts_file; dialog = gnome_dialog_new (_("Evolution installation"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, @@ -237,6 +238,14 @@ copy_default_stuff (const char *evolution_directory) retval = TRUE; } + /* Temporary block of code to keep it from using the older + shortcuts.xml that exists for current users in + $GNOME/share/evolution/default_user. Remove this by 1.0 */ + old_default_shortcuts_file = g_concat_dir_and_file (evolution_directory, + "shortcuts.xml"); + unlink (old_default_shortcuts_file); + g_free (old_default_shortcuts_file); + g_free (command); return retval; |