Merge branch 'mikabox/lock' into wip/mikabox

Conflicts:
	openbox/event.c

diff --cc Makefile.am
Simple merge

diff --cc obt/prop.c
Simple merge

diff --cc obt/prop.h
Simple merge

diff --cc openbox/actions.c
Simple merge

diff --cc openbox/actions.h
Simple merge

diff --cc openbox/actions/desktop.c
Simple merge

diff --cc openbox/actions/if.c
Simple merge

diff --cc openbox/actions/moveresizeto.c
Simple merge

diff --cc openbox/actions/resizerelative.c
Simple merge

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/client_menu.c
Simple merge

diff --cc openbox/event.c
index ccbb56e6ad5b3f6036e0404e744be94b32b9cbf0,fa631fa4c4a37e9657104f57632dff91374b5b0e..a1aa594048be2cffe24812a16ab7cd21d3742848
--- 1/openbox/event.c
--- 2/openbox/event.c
+++ b/openbox/event.c
@@@ -1495,9 -1489,11 +1498,12 @@@ static void event_handle_client(ObClien
              }
              else if ((Atom)e->xclient.data.l[2] ==
                       OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
 -                moveresize_end(TRUE);
 +                if (moveresize_client)
 +                    moveresize_end(TRUE);
          } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
+             if (client->locked)
+                 break;
+ 
              gint ograv, x, y, w, h;
  
              ograv = client->gravity;