gimp r25487 - in trunk: . app/plug-in

[mitch svn gnome org]

Author: mitch
Date: Mon Apr 14 16:01:23 2008
New Revision: 25487
URL: http://svn.gnome.org/viewvc/gimp?rev=25487&view=rev

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

	* app/plug-in/gimpplugin-message.c (gimp_plug_in_handle_tile_req):
	made messages about killed plug-ins due to invalid tile requests
	more verbose. They are good for debugging only and not translated,
	so more info can't hurt. Also fail (kill the plug-in) if a tile is
	requested that lives on the undo stack.



Modified:
   trunk/ChangeLog
   trunk/app/plug-in/gimpplugin-message.c

Modified: trunk/app/plug-in/gimpplugin-message.c
==============================================================================
--- trunk/app/plug-in/gimpplugin-message.c	(original)
+++ trunk/app/plug-in/gimpplugin-message.c	Mon Apr 14 16:01:23 2008
@@ -223,9 +223,22 @@
         {
           gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
                         "Plug-In \"%s\"\n(%s)\n\n"
-                        "requested invalid drawable (killing)",
+                        "tried writing to invalid drawable %d (killing)",
                         gimp_object_get_name (GIMP_OBJECT (plug_in)),
-                        gimp_filename_to_utf8 (plug_in->prog));
+                        gimp_filename_to_utf8 (plug_in->prog),
+                        tile_info->drawable_ID);
+          gimp_plug_in_close (plug_in, TRUE);
+          return;
+        }
+      else if (gimp_item_is_removed (GIMP_ITEM (drawable)))
+        {
+          gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        "Plug-In \"%s\"\n(%s)\n\n"
+                        "tried writing to drawable %d which was removed "
+                        "from the image (killing)",
+                        gimp_object_get_name (GIMP_OBJECT (plug_in)),
+                        gimp_filename_to_utf8 (plug_in->prog),
+                        tile_info->drawable_ID);
           gimp_plug_in_close (plug_in, TRUE);
           return;
         }
@@ -279,9 +292,22 @@
         {
           gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
                         "Plug-In \"%s\"\n(%s)\n\n"
-                        "requested invalid drawable (killing)",
+                        "tried reading from invalid drawable %d (killing)",
                         gimp_object_get_name (GIMP_OBJECT (plug_in)),
-                        gimp_filename_to_utf8 (plug_in->prog));
+                        gimp_filename_to_utf8 (plug_in->prog),
+                        tile_req->drawable_ID);
+          gimp_plug_in_close (plug_in, TRUE);
+          return;
+        }
+      else if (gimp_item_is_removed (GIMP_ITEM (drawable)))
+        {
+          gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+                        "Plug-In \"%s\"\n(%s)\n\n"
+                        "tried reading from drawable %d which was removed "
+                        "from the image (killing)",
+                        gimp_object_get_name (GIMP_OBJECT (plug_in)),
+                        gimp_filename_to_utf8 (plug_in->prog),
+                        tile_req->drawable_ID);
           gimp_plug_in_close (plug_in, TRUE);
           return;
         }