gimp r27967 - in trunk: . app/pdb

[neo svn gnome org]

Author: neo
Date: Wed Jan 28 22:12:34 2009
New Revision: 27967
URL: http://svn.gnome.org/viewvc/gimp?rev=27967&view=rev

Log:
2009-01-28  Sven Neumann  <sven gimp org>

	* app/pdb/gimpprocedure.c (gimp_procedure_execute): don't set an
	error if the procedure was cancelled.



Modified:
   trunk/ChangeLog
   trunk/app/pdb/gimpprocedure.c

Modified: trunk/app/pdb/gimpprocedure.c
==============================================================================
--- trunk/app/pdb/gimpprocedure.c	(original)
+++ trunk/app/pdb/gimpprocedure.c	Wed Jan 28 22:12:34 2009
@@ -334,8 +334,10 @@
 
   if (return_vals)
     {
-      if (g_value_get_enum (&return_vals->values[0]) != GIMP_PDB_SUCCESS)
+      switch (g_value_get_enum (&return_vals->values[0]))
         {
+        case GIMP_PDB_CALLING_ERROR:
+        case GIMP_PDB_EXECUTION_ERROR:
           /*  If the error has not already been set, construct one
            *  from the error message that is optionally passed with
            *  the return values.
@@ -349,6 +351,10 @@
 				       g_value_get_string (&return_vals->values[1]));
                 }
             }
+          break;
+
+        default:
+          break;
         }
     }
   else