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

[neo svn gnome org]

Author: neo
Date: Thu Feb 21 13:43:10 2008
New Revision: 24933
URL: http://svn.gnome.org/viewvc/gimp?rev=24933&view=rev

Log:
2008-02-21  Sven Neumann  <sven gimp org>

	* tools/pdbgen/app.pl (marshal_outargs): insert a missing newline
	for procedures without additional return values.

	* tools/pdbgen/pdb/display.pdb: cosmetics.

	* app/pdb/brushes_cmds.c
	* app/pdb/context_cmds.c
	* app/pdb/display_cmds.c
	* app/pdb/fonts_cmds.c
	* app/pdb/gradients_cmds.c
	* app/pdb/palettes_cmds.c
	* app/pdb/patterns_cmds.c: regenerated.


Modified:
   trunk/ChangeLog
   trunk/app/pdb/brushes_cmds.c
   trunk/app/pdb/context_cmds.c
   trunk/app/pdb/display_cmds.c
   trunk/app/pdb/fonts_cmds.c
   trunk/app/pdb/gradients_cmds.c
   trunk/app/pdb/palettes_cmds.c
   trunk/app/pdb/patterns_cmds.c
   trunk/tools/pdbgen/app.pl
   trunk/tools/pdbgen/pdb/display.pdb

Modified: trunk/app/pdb/brushes_cmds.c
==============================================================================
--- trunk/app/pdb/brushes_cmds.c	(original)
+++ trunk/app/pdb/brushes_cmds.c	Thu Feb 21 13:43:10 2008
@@ -49,6 +49,7 @@
                          GError            **error)
 {
   gimp_data_factory_data_refresh (gimp->brush_factory);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/app/pdb/context_cmds.c
==============================================================================
--- trunk/app/pdb/context_cmds.c	(original)
+++ trunk/app/pdb/context_cmds.c	Thu Feb 21 13:43:10 2008
@@ -248,6 +248,7 @@
                                     GError            **error)
 {
   gimp_context_set_default_colors (context);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 
@@ -260,6 +261,7 @@
                              GError            **error)
 {
   gimp_context_swap_colors (context);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/app/pdb/display_cmds.c
==============================================================================
--- trunk/app/pdb/display_cmds.c	(original)
+++ trunk/app/pdb/display_cmds.c	Thu Feb 21 13:43:10 2008
@@ -84,7 +84,9 @@
             g_object_unref (image);
         }
       else
-        success = FALSE;
+        {
+          success = FALSE;
+        }
     }
 
   return_vals = gimp_procedure_get_return_values (procedure, success);
@@ -153,6 +155,7 @@
                         GError            **error)
 {
   gimp_container_foreach (gimp->images, (GFunc) gimp_image_flush, NULL);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/app/pdb/fonts_cmds.c
==============================================================================
--- trunk/app/pdb/fonts_cmds.c	(original)
+++ trunk/app/pdb/fonts_cmds.c	Thu Feb 21 13:43:10 2008
@@ -44,6 +44,7 @@
                        GError            **error)
 {
   gimp_fonts_load (gimp);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/app/pdb/gradients_cmds.c
==============================================================================
--- trunk/app/pdb/gradients_cmds.c	(original)
+++ trunk/app/pdb/gradients_cmds.c	Thu Feb 21 13:43:10 2008
@@ -48,6 +48,7 @@
                            GError            **error)
 {
   gimp_data_factory_data_refresh (gimp->gradient_factory);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/app/pdb/palettes_cmds.c
==============================================================================
--- trunk/app/pdb/palettes_cmds.c	(original)
+++ trunk/app/pdb/palettes_cmds.c	Thu Feb 21 13:43:10 2008
@@ -50,6 +50,7 @@
                           GError            **error)
 {
   gimp_data_factory_data_refresh (gimp->palette_factory);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/app/pdb/patterns_cmds.c
==============================================================================
--- trunk/app/pdb/patterns_cmds.c	(original)
+++ trunk/app/pdb/patterns_cmds.c	Thu Feb 21 13:43:10 2008
@@ -49,6 +49,7 @@
                           GError            **error)
 {
   gimp_data_factory_data_refresh (gimp->pattern_factory);
+
   return gimp_procedure_get_return_values (procedure, TRUE);
 }
 

Modified: trunk/tools/pdbgen/app.pl
==============================================================================
--- trunk/tools/pdbgen/app.pl	(original)
+++ trunk/tools/pdbgen/app.pl	Thu Feb 21 13:43:10 2008
@@ -175,7 +175,12 @@
         $result .= "\n" . ' ' x 2 . "return return_vals;\n";
     }
     else {
-	$result =~ s/_vals =//;
+	if ($success) {
+	    $result =~ s/return_vals =/return/;
+	}
+	else {
+	    $result =~ s/  return_vals =/\n  return/;
+	}
     }
 
     $result =~ s/, success\);$/, TRUE);/m unless $success;

Modified: trunk/tools/pdbgen/pdb/display.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/display.pdb	(original)
+++ trunk/tools/pdbgen/pdb/display.pdb	Thu Feb 21 13:43:10 2008
@@ -83,7 +83,9 @@
         g_object_unref (image);
     }
   else
-    success = FALSE;
+    {
+      success = FALSE;
+    }
 }
 CODE
     );