From: Dana Jansens <danakj@orodu.net>
Date: Wed, 9 Dec 2009 20:09:49 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.9~7
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8ba9884fd7406e579ba884794e4ec6539afcf947;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/focus.c
---

8ba9884fd7406e579ba884794e4ec6539afcf947
diff --cc openbox/actions/focus.c
index a157b4ad,8da8ed5e..5c868085
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@@ -72,8 -57,7 +73,8 @@@ static gboolean run_func(ObActionsData 
               data->context != OB_FRAME_CONTEXT_FRAME))
          {
              actions_client_move(data, TRUE);
-             client_activate(data->client, o->here,
 -            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) {