[gimp] app: don't make flatten and merge insensitive if there is a floating selection

[Michael Natterer <mitch src gnome org>]

commit 4807a1848a39c4514e9545b37914d3463ec8fb9b
Author: Michael Natterer <mitch gimp org>
Date:   Mon Feb 14 01:45:16 2011 +0100

    app: don't make flatten and merge insensitive if there is a floating selection

 app/actions/image-actions.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index 9a5737e..42a18e1 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -278,8 +278,8 @@ image_actions_update (GimpActionGroup *group,
   SET_SENSITIVE ("image-scale",               image);
   SET_SENSITIVE ("image-crop",                image && sel);
   SET_SENSITIVE ("image-duplicate",           image);
-  SET_SENSITIVE ("image-merge-layers",        image && !fs && !aux && lp);
-  SET_SENSITIVE ("image-flatten",             image && !fs && !aux && lp);
+  SET_SENSITIVE ("image-merge-layers",        image && !aux && lp);
+  SET_SENSITIVE ("image-flatten",             image && !aux && lp);
   SET_SENSITIVE ("image-configure-grid",      image);
   SET_SENSITIVE ("image-properties",          image);