gimp r25573 - in branches/gimp-2-4: . libgimpwidgets

[neo svn gnome org]

Author: neo
Date: Tue May  6 11:46:57 2008
New Revision: 25573
URL: http://svn.gnome.org/viewvc/gimp?rev=25573&view=rev

Log:
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.


Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/libgimpwidgets/gimpcolorprofilestore.c

Modified: branches/gimp-2-4/libgimpwidgets/gimpcolorprofilestore.c
==============================================================================
--- branches/gimp-2-4/libgimpwidgets/gimpcolorprofilestore.c	(original)
+++ branches/gimp-2-4/libgimpwidgets/gimpcolorprofilestore.c	Tue May  6 11:46:57 2008
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
  * 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
  * modify it under the terms of the GNU Lesser General Public
@@ -590,9 +590,11 @@
     {
       gchar *filename = g_filename_from_uri (uri, NULL, NULL);
 
-      if (filename)
-        gimp_color_profile_store_history_insert (store, &iter,
-                                                 filename, label, index);
+      if (filename && g_file_test (filename, G_FILE_TEST_IS_REGULAR))
+        {
+          gimp_color_profile_store_history_insert (store, &iter,
+                                                   filename, label, index);
+        }
 
       g_free (filename);
       g_free (label);