gimp r25351 - in trunk: . app/pdb tools/pdbgen/pdb

[mitch svn gnome org]

Author: mitch
Date: Thu Apr  3 11:01:16 2008
New Revision: 25351
URL: http://svn.gnome.org/viewvc/gimp?rev=25351&view=rev

Log:
2008-04-03  Michael Natterer  <mitch gimp org>

	* app/pdb/gimppdb-utils.c
	* tools/pdbgen/pdb/text_layer.pdb: GIMP_PDB_CALLING_ERROR and
	GIMP_PDB_EXECUTION_ERROR are not from the GimpPdbErrorCode
	enum. Use GIMP_PDB_INVALID_ARGUMENT instead.

	* app/pdb/text_layer_cmds.c: regenerated.



Modified:
   trunk/ChangeLog
   trunk/app/pdb/gimppdb-utils.c
   trunk/app/pdb/text_layer_cmds.c
   trunk/tools/pdbgen/pdb/text_layer.pdb

Modified: trunk/app/pdb/gimppdb-utils.c
==============================================================================
--- trunk/app/pdb/gimppdb-utils.c	(original)
+++ trunk/app/pdb/gimppdb-utils.c	Thu Apr  3 11:01:16 2008
@@ -54,7 +54,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty brush name"));
       return NULL;
     }
@@ -64,12 +64,12 @@
 
   if (! brush)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Brush '%s' not found"), name);
     }
   else if (writable && ! GIMP_DATA (brush)->writable)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Brush '%s' is not editable"), name);
       return NULL;
     }
@@ -95,7 +95,7 @@
 
   if (! GIMP_IS_BRUSH_GENERATED (brush))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Brush '%s' is not a generated brush"), name);
       return NULL;
     }
@@ -115,7 +115,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty pattern name"));
       return NULL;
     }
@@ -125,7 +125,7 @@
 
   if (! pattern)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Pattern '%s' not found"), name);
     }
 
@@ -145,7 +145,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty gradient name"));
       return NULL;
     }
@@ -155,12 +155,12 @@
 
   if (! gradient)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Gradient '%s' not found"), name);
     }
   else if (writable && ! GIMP_DATA (gradient)->writable)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Gradient '%s' is not editable"), name);
       return NULL;
     }
@@ -181,7 +181,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty palette name"));
       return NULL;
     }
@@ -191,12 +191,12 @@
 
   if (! palette)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Palette '%s' not found"), name);
     }
   else if (writable && ! GIMP_DATA (palette)->writable)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Palette '%s' is not editable"), name);
       return NULL;
     }
@@ -216,7 +216,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty font name"));
       return NULL;
     }
@@ -226,7 +226,7 @@
 
   if (! font)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Font '%s' not found"), name);
     }
 
@@ -245,7 +245,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty buffer name"));
       return NULL;
     }
@@ -255,7 +255,7 @@
 
   if (! buffer)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Named buffer '%s' not found"), name);
     }
 
@@ -274,7 +274,7 @@
 
   if (! name || ! strlen (name))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Invalid empty paint method name"));
       return NULL;
     }
@@ -284,7 +284,7 @@
 
   if (! paint_info)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Paint method '%s' does not exist"), name);
     }
 
@@ -300,7 +300,7 @@
 
   if (! gimp_item_is_attached (item))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Item '%s' (%d) can not be used because it has not "
                      "been added to an image"),
                    gimp_object_get_name (GIMP_OBJECT (item)),
@@ -321,7 +321,7 @@
 
   if (! gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer)))
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Layer '%s' (%d) can not be used because it is not "
                      "a text layer"),
                    gimp_object_get_name (GIMP_OBJECT (layer)),
@@ -348,11 +348,10 @@
 
   if (! stroke)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_CALLING_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Vectors object %d does not contain stroke with ID %d"),
                    gimp_item_get_ID (GIMP_ITEM (vectors)), stroke_ID);
     }
 
   return stroke;
 }
-

Modified: trunk/app/pdb/text_layer_cmds.c
==============================================================================
--- trunk/app/pdb/text_layer_cmds.c	(original)
+++ trunk/app/pdb/text_layer_cmds.c	Thu Apr  3 11:01:16 2008
@@ -86,7 +86,7 @@
 
       if (! layer)
         {
-          g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_EXECUTION_ERROR,
+          g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                        _("Failed to create text layer"));
 
           success = FALSE;

Modified: trunk/tools/pdbgen/pdb/text_layer.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/text_layer.pdb	(original)
+++ trunk/tools/pdbgen/pdb/text_layer.pdb	Thu Apr  3 11:01:16 2008
@@ -67,7 +67,7 @@
 
   if (! layer)
     {
-      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_EXECUTION_ERROR,
+      g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
                    _("Failed to create text layer"));
 
       success = FALSE;