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

Merged from trunk: 

2008-05-06  Sven Neumann  <sven@gimp.org>

	Merged from trunk:

	* libgimpwidgets/gimpcolorprofilestore.c
	(gimp_color_profile_store_load_profile): check if the file exists
	before adding it to the history. Fixes bug #528958.

svn path=/branches/gimp-2-4/; revision=25573
This commit is contained in:
Sven Neumann 2008-05-06 11:46:57 +00:00 committed by Sven Neumann
parent add0e12026
commit ece7841fad
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-05-06 Sven Neumann <sven@gimp.org>
Merged from trunk:
* libgimpwidgets/gimpcolorprofilestore.c
(gimp_color_profile_store_load_profile): check if the file exists
before adding it to the history. Fixes bug #528958.
2008-05-05 Sven Neumann <sven@gimp.org> 2008-05-05 Sven Neumann <sven@gimp.org>
Merged from trunk: Merged from trunk:

10
libgimpwidgets/gimpcolorprofilestore.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpprofilestore.c * gimpprofilestore.c
* Copyright (C) 2004-2007 Sven Neumann <sven@gimp.org> * Copyright (C) 2004-2008 Sven Neumann <sven@gimp.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -590,9 +590,11 @@ gimp_color_profile_store_load_profile (GimpColorProfileStore *store,
{ {
gchar *filename = g_filename_from_uri (uri, NULL, NULL); gchar *filename = g_filename_from_uri (uri, NULL, NULL);
if (filename) if (filename && g_file_test (filename, G_FILE_TEST_IS_REGULAR))
gimp_color_profile_store_history_insert (store, &iter, {
filename, label, index); gimp_color_profile_store_history_insert (store, &iter,
filename, label, index);
}
g_free (filename); g_free (filename);
g_free (label); g_free (label);