From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 17 Apr 2013 10:50:22 +0000 (+0200)
Subject: Merge branch 'mikabox/lock' into wip/mikabox
X-Git-Tag: mikabox-3.5-7~38
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=c4372f168192622971ef36ebd050fb020e3fee65;p=mikachu%2Fopenbox.git

Merge branch 'mikabox/lock' into wip/mikabox

Conflicts:
	openbox/event.c
---

c4372f168192622971ef36ebd050fb020e3fee65
diff --cc openbox/event.c
index ccbb56e6,fa631fa4..a1aa5940
--- a/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;