From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 16:52:07 +0000 (+0000)
Subject: merge r6303 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~106
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0c4fa7bd2ad93c49c296b028805511153908888d;p=dana%2Fopenbox.git

merge r6303 from trunk
---

diff --git a/openbox/action.c b/openbox/action.c
index 5cc0bb21..58952a1a 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1545,6 +1545,9 @@ void action_desktop_dir(union ActionData *data)
                              data->desktopdir.inter.any.interactive,
                              data->desktopdir.inter.final,
                              data->desktopdir.inter.cancel);
+    /* only move the desktop when the action is complete. if we switch
+       desktops during the interactive action, focus will move but with
+       NotifyWhileGrabbed and applications don't like that. */
     if (!data->sendtodir.inter.any.interactive ||
         (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
@@ -1564,6 +1567,9 @@ void action_send_to_desktop_dir(union ActionData *data)
                              data->sendtodir.inter.any.interactive,
                              data->sendtodir.inter.final,
                              data->sendtodir.inter.cancel);
+    /* only move the desktop when the action is complete. if we switch
+       desktops during the interactive action, focus will move but with
+       NotifyWhileGrabbed and applications don't like that. */
     if (!data->sendtodir.inter.any.interactive ||
         (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {