gimp r27626 - in trunk: . app/pdb app/plug-in

[neo svn gnome org]

Author: neo
Date: Wed Nov 12 10:06:07 2008
New Revision: 27626
URL: http://svn.gnome.org/viewvc/gimp?rev=27626&view=rev

Log:
2008-11-12  Sven Neumann  <sven gimp org>

	* app/pdb/gimppdberror.h
	* app/plug-in/gimppluginerror.h: added generic error codes.

	* app/pdb/gimpprocedure.c
	* app/plug-in/gimppluginprocedure.c: use the GIMP_PDB_ERROR and
	GIMP_PLUG_IN_ERROR domains.



Modified:
   trunk/ChangeLog
   trunk/app/pdb/gimppdberror.h
   trunk/app/pdb/gimpprocedure.c
   trunk/app/plug-in/gimppluginerror.h
   trunk/app/plug-in/gimppluginprocedure.c

Modified: trunk/app/pdb/gimppdberror.h
==============================================================================
--- trunk/app/pdb/gimppdberror.h	(original)
+++ trunk/app/pdb/gimppdberror.h	Wed Nov 12 10:06:07 2008
@@ -22,10 +22,11 @@
 
 typedef enum
 {
+  GIMP_PDB_FAILED,  /* generic error condition */
+  GIMP_PDB_CANCELLED,
   GIMP_PDB_PROCEDURE_NOT_FOUND,
   GIMP_PDB_INVALID_ARGUMENT,
   GIMP_PDB_INVALID_RETURN_VALUE,
-  GIMP_PDB_CANCELLED,
   GIMP_PDB_INTERNAL_ERROR
 } GimpPdbErrorCode;
 

Modified: trunk/app/pdb/gimpprocedure.c
==============================================================================
--- trunk/app/pdb/gimpprocedure.c	(original)
+++ trunk/app/pdb/gimpprocedure.c	Wed Nov 12 10:06:07 2008
@@ -346,7 +346,7 @@
               if (return_vals->n_values > 1 &&
                   G_VALUE_HOLDS_STRING (&return_vals->values[1]))
                 {
-                  g_set_error_literal (error, 0, 0,
+                  g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_FAILED,
 				       g_value_get_string (&return_vals->values[1]));
                 }
             }

Modified: trunk/app/plug-in/gimppluginerror.h
==============================================================================
--- trunk/app/plug-in/gimppluginerror.h	(original)
+++ trunk/app/plug-in/gimppluginerror.h	Wed Nov 12 10:06:07 2008
@@ -22,6 +22,7 @@
 
 typedef enum
 {
+  GIMP_PLUG_IN_FAILED,  /* generic error condition */
   GIMP_PLUG_IN_EXECUTION_FAILED,
   GIMP_PLUG_IN_NOT_FOUND
 } GimpPlugInErrorCode;

Modified: trunk/app/plug-in/gimppluginprocedure.c
==============================================================================
--- trunk/app/plug-in/gimppluginprocedure.c	(original)
+++ trunk/app/plug-in/gimppluginprocedure.c	Wed Nov 12 10:06:07 2008
@@ -36,6 +36,8 @@
 
 #define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
 #include "gimppluginmanager-call.h"
+
+#include "gimppluginerror.h"
 #include "gimppluginprocedure.h"
 #include "plug-in-menu-path.h"
 
@@ -349,7 +351,7 @@
     {
       basename = g_filename_display_basename (proc->prog);
 
-      g_set_error (error, 0, 0,
+      g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
                    "Plug-In \"%s\"\n(%s)\n"
                    "attempted to install procedure \"%s\"\n"
                    "in the invalid menu location \"%s\".\n"
@@ -469,7 +471,7 @@
     {
       basename = g_filename_display_basename (proc->prog);
 
-      g_set_error (error, 0, 0,
+      g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
                    "Plug-In \"%s\"\n(%s)\n"
                    "attempted to install procedure \"%s\" "
                    "in the invalid menu location \"%s\".\n"
@@ -505,7 +507,7 @@
 
       basename = g_filename_display_basename (proc->prog);
 
-      g_set_error (error, 0, 0,
+      g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
                    "Plug-In \"%s\"\n(%s)\n\n"
                    "attempted to install %s procedure \"%s\" "
                    "which does not take the standard %s Plug-In "