[gimp/soc-2011-warp: 70/72] imagemap: disable the queuing for the legacy code, due to regression

[Michael Murà <mmure src gnome org>]

commit 1730edfc59ed355181b6243574f6800b6bab6cd9
Author: Michael Murà <batolettre gmail com>
Date:   Wed Aug 3 22:42:22 2011 +0200

    imagemap: disable the queuing for the legacy code, due to regression

 app/core/gimpimagemap.c |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/app/core/gimpimagemap.c b/app/core/gimpimagemap.c
index b3ac98a..e0adce4 100644
--- a/app/core/gimpimagemap.c
+++ b/app/core/gimpimagemap.c
@@ -633,14 +633,23 @@ gimp_image_map_apply_real (GimpImageMap        *image_map,
   if (!gegl_rectangle_intersect (NULL, full_region, to_render))
     return;
 
-  /*  If we're still working, queue the region to render and return.  */
-  if (image_map->idle_id)
+  if (!image_map->operation)
     {
-      gegl_rectangle_bounding_box (&image_map->queue, &image_map->queue, to_render);
-      return;
+      /* If we're still working, remove the timer */
+      gimp_image_map_cancel_any_idle_jobs (image_map);
     }
-
-  gegl_rectangle_set (&image_map->queue, 0, 0, 0, 0);
+  else
+  {
+    /* If we're still working, queue the region to render and return. */
+    /* Only for the Gegl way, to avoid regression */
+    if (image_map->idle_id)
+      {
+        gegl_rectangle_bounding_box (&image_map->queue, &image_map->queue, to_render);
+        return;
+      }
+
+    gegl_rectangle_set (&image_map->queue, 0, 0, 0, 0);
+  }
 
   /*  If undo tiles don't exist, or change size, (re)allocate  */
   reallocate = gimp_image_map_update_undo_tiles (image_map,
@@ -982,11 +991,6 @@ gimp_image_map_do (GimpImageMap *image_map)
 
               g_signal_emit (image_map, image_map_signals[FLUSH], 0);
 
-              if (!gegl_rectangle_is_empty (&image_map->queue))
-                {
-                  gimp_image_map_apply_region (image_map, &image_map->queue);
-                }
-
               return FALSE;
             }
         }