[gimp/soc-2011-seamless-clone2] Bug 697530 - zoom during mouse-pan focuses on wrong location

[Clayton Walker <claytonw src gnome org>]

commit e487f615cdf6947665dcc9a1655c89b5d20e7a74
Author: Michael Natterer <mitch gimp org>
Date:   Sun Apr 21 20:00:28 2013 +0200

    Bug 697530 - zoom during mouse-pan focuses on wrong location
    
    Block all key events while middle-mouse panning, to prevent
    accelerators from being invoked.

 app/display/gimpdisplayshell-tool-events.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 089cc40..134b7a2 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -208,7 +208,7 @@ gimp_display_shell_events (GtkWidget        *widget,
             break;
 
           default:
-            if (shell->space_pressed)
+            if (shell->space_pressed || shell->scrolling)
               return TRUE;
             break;
           }