From 152af52bfe636d5607a8773759a498484dc284f5 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sun, 17 Sep 2006 19:29:07 +0000 Subject: [PATCH] do not migrate toolrc and the tool-options folder. 2006-09-17 Sven Neumann * app/core/gimp-user-install.c (user_install_migrate_files): do not migrate toolrc and the tool-options folder. --- ChangeLog | 5 +++++ app/core/gimp-user-install.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 513fa527d3..06e7eb3006 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-17 Sven Neumann + + * app/core/gimp-user-install.c (user_install_migrate_files): + do not migrate toolrc and the tool-options folder. + 2006-09-17 Manish Singh * plug-ins/pygimp/gimpui.override: override implementation of diff --git a/app/core/gimp-user-install.c b/app/core/gimp-user-install.c index 1e0e042ccc..586c299850 100644 --- a/app/core/gimp-user-install.c +++ b/app/core/gimp-user-install.c @@ -458,10 +458,11 @@ user_install_migrate_files (GimpUserInstall *install) if (g_file_test (source, G_FILE_TEST_IS_REGULAR)) { - /* skip these for all old versions */ + /* skip these files for all old versions */ if ((strncmp (basename, "gimpswap.", 9) == 0) || - (strncmp (basename, "pluginrc", 8) == 0) || - (strncmp (basename, "themerc", 7) == 0)) + (strcmp (basename, "pluginrc") == 0) || + (strcmp (basename, "themerc") == 0) || + (strcmp (basename, "toolrc") == 0)) { goto next_file; } @@ -477,9 +478,15 @@ user_install_migrate_files (GimpUserInstall *install) user_install_file_copy (install, source, dest); } - else if (g_file_test (source, G_FILE_TEST_IS_DIR) && - strcmp (basename, "tmp") != 0) + else if (g_file_test (source, G_FILE_TEST_IS_DIR)) { + /* skip these directories for all old versions */ + if (strcmp (basename, "tmp") == 0 || + strcmp (basename, "tool-options") == 0) + { + goto next_file; + } + user_install_dir_copy (install, source, gimp_directory ()); }