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

[neo svn gnome org]

Author: neo
Date: Mon Apr  7 10:12:07 2008
New Revision: 25386
URL: http://svn.gnome.org/viewvc/gimp?rev=25386&view=rev

Log:
2008-04-07  Sven Neumann  <sven gimp org>

	* tools/pdbgen/pdb/procedural_db.pdb (procedural_db_proc_exists):
	canonicalize the procedure name and also try compat names.

	* app/pdb/procedural-db-cmds.c: regenerated.


Modified:
   trunk/ChangeLog
   trunk/app/pdb/procedural-db-cmds.c
   trunk/tools/pdbgen/pdb/procedural_db.pdb

Modified: trunk/app/pdb/procedural-db-cmds.c
==============================================================================
--- trunk/app/pdb/procedural-db-cmds.c	(original)
+++ trunk/app/pdb/procedural-db-cmds.c	Mon Apr  7 10:12:07 2008
@@ -145,7 +145,24 @@
 
   if (success)
     {
-      exists = (gimp_pdb_lookup_procedure (gimp->pdb, procedure_name) != NULL);
+      GimpProcedure *procedure;
+      gchar         *canonical;
+
+      canonical = gimp_canonicalize_identifier (procedure_name);
+
+      procedure = gimp_pdb_lookup_procedure (gimp->pdb, canonical);
+
+      if (! procedure)
+        {
+          procedure_name = gimp_pdb_lookup_compat_proc_name (gimp->pdb, canonical);
+
+          if (procedure_name)
+            procedure = gimp_pdb_lookup_procedure (gimp->pdb, procedure_name);
+        }
+
+      g_free (canonical);
+
+      exists = (procedure != NULL);
     }
 
   return_vals = gimp_procedure_get_return_values (procedure, success);

Modified: trunk/tools/pdbgen/pdb/procedural_db.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/procedural_db.pdb	(original)
+++ trunk/tools/pdbgen/pdb/procedural_db.pdb	Mon Apr  7 10:12:07 2008
@@ -156,7 +156,24 @@
     %invoke = (
 	code => <<'CODE'
 {
-  exists = (gimp_pdb_lookup_procedure (gimp->pdb, procedure_name) != NULL);
+  GimpProcedure *procedure;
+  gchar         *canonical;
+
+  canonical = gimp_canonicalize_identifier (procedure_name);
+
+  procedure = gimp_pdb_lookup_procedure (gimp->pdb, canonical);
+
+  if (! procedure)
+    {
+      procedure_name = gimp_pdb_lookup_compat_proc_name (gimp->pdb, canonical);
+
+      if (procedure_name)
+        procedure = gimp_pdb_lookup_procedure (gimp->pdb, procedure_name);
+    }
+
+  g_free (canonical);
+
+  exists = (procedure != NULL);
 }
 CODE
     );