Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/focus.c

diff --cc Makefile.am
Simple merge

diff --cc data/rc.xml
Simple merge

diff --cc openbox/actions/focus.c
index 5c868085c079718cf4d7ba08daccff76eb53b03d,1b544910220f8143dedd588ceda914b620c0058d..be5de2f67d5e66c0389930cfdca929d9b2ff7103
--- 1/openbox/actions/focus.c
--- 2/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) {

diff --cc openbox/config.c
Simple merge

diff --cc openbox/config.h
Simple merge

diff --cc openbox/menuframe.h
Simple merge