[gimp] plug-ins: fix pdb input validation in map-object

[Mikael Magnusson <mikachu src gnome org>]

commit 0344cb4a425adcd9e7133e4ec2b54c09dd43a01d
Author: Mikael Magnusson <mikachu src gnome org>
Date:   Sun Feb 20 09:11:31 2011 +0100

    plug-ins: fix pdb input validation in map-object

 plug-ins/map-object/map-object-main.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/plug-ins/map-object/map-object-main.c b/plug-ins/map-object/map-object-main.c
index 8d75ad6..d899d02 100644
--- a/plug-ins/map-object/map-object-main.c
+++ b/plug-ins/map-object/map-object-main.c
@@ -108,12 +108,9 @@ check_drawables (GimpDrawable *drawable)
 
   for (i = 0; i < 6; i++)
     {
-      if (mapvals.boxmap_id[i] == -1)
-        mapvals.boxmap_id[i] = drawable->drawable_id;
-      else if (mapvals.boxmap_id[i] != -1 &&
-	       gimp_item_get_image (mapvals.boxmap_id[i]) == -1)
-        mapvals.boxmap_id[i] = drawable->drawable_id;
-      else if (gimp_drawable_is_gray (mapvals.boxmap_id[i]))
+      if (mapvals.boxmap_id[i] == -1 ||
+	  !gimp_item_is_valid (mapvals.boxmap_id[i]) ||
+          gimp_drawable_is_gray (mapvals.boxmap_id[i]))
         mapvals.boxmap_id[i] = drawable->drawable_id;
     }
 
@@ -122,12 +119,9 @@ check_drawables (GimpDrawable *drawable)
 
   for (i = 0; i < 2; i++)
     {
-      if (mapvals.cylindermap_id[i] == -1)
-        mapvals.cylindermap_id[i] = drawable->drawable_id;
-      else if (mapvals.cylindermap_id[i]!=-1 &&
-               gimp_item_get_image (mapvals.cylindermap_id[i]) == -1)
-        mapvals.cylindermap_id[i] = drawable->drawable_id;
-      else if (gimp_drawable_is_gray (mapvals.cylindermap_id[i]))
+      if (mapvals.cylindermap_id[i] == -1 ||
+          !gimp_item_is_valid (mapvals.cylindermap_id[i]) ||
+          gimp_drawable_is_gray (mapvals.cylindermap_id[i]))
         mapvals.cylindermap_id[i] = drawable->drawable_id;
     }
 }