Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/event.c

diff --cc openbox/client.c
Simple merge

diff --cc openbox/event.c
index e047608f22f5e1d125d917330313eb2fea60d4ce,30bc656fbfb641724746a47ec6d655bb970a04c2..dc610d51536ab92bd143987680f362bd8bb11dd3
--- 1/openbox/event.c
--- 2/openbox/event.c
+++ b/openbox/event.c
@@@ -1362,13 -1344,10 +1362,13 @@@ static void event_handle_client(ObClien
              } else
                  ob_debug_type(OB_DEBUG_APP_BUGS,
                                "_NET_ACTIVE_WINDOW message for window %s is "
-                               "missing source indication");
+                               "missing source indication", client->title);
 -            client_activate(client, TRUE, TRUE, TRUE,
 -                            (e->xclient.data.l[0] == 0 ||
 -                             e->xclient.data.l[0] == 2));
 +            if (!client->locked)
 +                client_activate(client, TRUE, TRUE, TRUE,
 +                                (e->xclient.data.l[0] == 0 ||
 +                                 e->xclient.data.l[0] == 2));
 +        } else if (msgtype == OBT_PROP_ATOM(OB_FOCUS)) {
 +            client_focus(client);
          } else if (msgtype == OBT_PROP_ATOM(NET_WM_MOVERESIZE)) {
              ob_debug("net_wm_moveresize for 0x%lx direction %d",
                       client->window, e->xclient.data.l[2]);