From: Dana Jansens <danakj@orodu.net>
Date: Wed, 6 Jan 2010 22:32:14 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.10~2
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ad96eba56e381e914a12637d7742c445bbb65980;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/focus.c
---

ad96eba56e381e914a12637d7742c445bbb65980
diff --cc openbox/actions/focus.c
index 5c868085,1b544910..be5de2f6
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@@ -6,7 -6,7 +6,8 @@@
  
  typedef struct {
      gboolean here;
 +    gboolean activate;
+     gboolean stop_int;
  } Options;
  
  static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
@@@ -72,9 -60,11 +76,12 @@@ static gboolean run_func(ObActionsData 
              (data->context != OB_FRAME_CONTEXT_CLIENT &&
               data->context != OB_FRAME_CONTEXT_FRAME))
          {
+             if (o->stop_int)
+                 actions_interactive_cancel_act();
+ 
              actions_client_move(data, TRUE);
 -            client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
 +            client_activate(data->client, TRUE, o->here,
 +                            o->activate, o->activate, TRUE);
              actions_client_move(data, FALSE);
          }
      } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {