From a4beeecf2b6f42659bdffac8b3795abfb18eee34 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 5 May 2012 00:17:51 +0200 Subject: [PATCH] app: make sure Ctrl+E doesn't invoke "Export to" when it's invisible (cherry picked from commit 4c66e50763dac2eebfd9b6fc4dd579a8f5df422c) --- app/actions/file-actions.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c index 238922119e..b4a16accc2 100644 --- a/app/actions/file-actions.c +++ b/app/actions/file-actions.c @@ -261,9 +261,9 @@ file_actions_update (GimpActionGroup *group, if (image) { - drawable = gimp_image_get_active_drawable (image); - source = gimp_image_get_imported_uri (image); - export = gimp_image_get_exported_uri (image); + drawable = gimp_image_get_active_drawable (image); + source = gimp_image_get_imported_uri (image); + export = gimp_image_get_exported_uri (image); } show_overwrite = @@ -280,7 +280,7 @@ file_actions_update (GimpActionGroup *group, SET_SENSITIVE ("file-save-as", drawable); SET_SENSITIVE ("file-save-a-copy", drawable); SET_SENSITIVE ("file-revert", image && (gimp_image_get_uri (image) || source)); - SET_SENSITIVE ("file-export-to", drawable); + SET_SENSITIVE ("file-export-to", drawable && ! show_overwrite); SET_VISIBLE ("file-export-to", ! show_overwrite); SET_SENSITIVE ("file-overwrite", show_overwrite); SET_VISIBLE ("file-overwrite", show_overwrite); @@ -307,7 +307,7 @@ file_actions_update (GimpActionGroup *group, } /* needed for the empty display */ - SET_SENSITIVE ("file-close-all", image); + SET_SENSITIVE ("file-close-all", image); #undef SET_SENSITIVE }