gimp r26967 - in trunk: . plug-ins/script-fu

[neo svn gnome org]

Author: neo
Date: Wed Sep 17 11:15:34 2008
New Revision: 26967
URL: http://svn.gnome.org/viewvc/gimp?rev=26967&view=rev

Log:
2008-09-17  Sven Neumann  <sven gimp org>

	* plug-ins/script-fu/script-fu-interface.c (script_fu_ok): set 
the
	PDB error handler to GIMP_PDB_ERROR_HANDLER_PLUGIN while
	interpreting the script.



Modified:
   trunk/ChangeLog
   trunk/plug-ins/script-fu/script-fu-interface.c

Modified: trunk/plug-ins/script-fu/script-fu-interface.c
==============================================================================
--- trunk/plug-ins/script-fu/script-fu-interface.c	(original)
+++ trunk/plug-ins/script-fu/script-fu-interface.c	Wed Sep 17 11:15:34 2008
@@ -156,7 +156,8 @@
 
       if (! g_str_has_prefix (command, "gimp-progress-"))
         {
-          gtk_label_set_text (GTK_LABEL (sf_interface->progress_label), command);
+          gtk_label_set_text (GTK_LABEL (sf_interface->progress_label),
+                              command);
         }
       else
         {
@@ -910,8 +911,18 @@
   output = g_string_new (NULL);
   ts_register_output_func (ts_gstring_output_func, output);
 
+  gimp_plugin_set_pdb_error_handler (GIMP_PDB_ERROR_HANDLER_PLUGIN);
+
   if (ts_interpret_string (command))
-    g_message (_("Error while executing\n%s\n\n%s"), command, output->str);
+    {
+      gchar *message = g_strdup_printf (_("Error while executing %s:"),
+                                        script->name);
+
+      g_message ("%s\n\n%s", message, output->str);
+      g_free (message);
+    }
+
+  gimp_plugin_set_pdb_error_handler (GIMP_PDB_ERROR_HANDLER_INTERNAL);
 
   g_string_free (output, TRUE);