dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not migrate toolrc and the tool-options folder. 

2006-09-17  Sven Neumann  <sven@gimp.org>

	* app/core/gimp-user-install.c (user_install_migrate_files):
	do not migrate toolrc and the tool-options folder.
This commit is contained in:
Sven Neumann 2006-09-17 19:29:07 +00:00 committed by Sven Neumann
parent e409f42d6a
commit 152af52bfe
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-09-17 Sven Neumann <sven@gimp.org>
* app/core/gimp-user-install.c (user_install_migrate_files):
do not migrate toolrc and the tool-options folder.
2006-09-17 Manish Singh <yosh@gimp.org>
* plug-ins/pygimp/gimpui.override: override implementation of

17
app/core/gimp-user-install.c
View File

@ -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 ());
}