memory leak in xinerama setup code

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index b49d3ff8654e111027b9cd31e5a1dc5b1d999007..7c29f9f2fbb352494fa3bc7722e37c5f8e1fed92 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -417,7 +417,7 @@ void client_manage(Window window)
             /* Don't steal focus from globally active clients.
                I stole this idea from KWin. It seems nice.
              */
-            if (!focus_client->can_focus && focus_client->focus_notify)
+            if (!(focus_client->can_focus || focus_client->focus_notify))
                 activate = FALSE;
         }
 
@@ -2389,8 +2389,9 @@ void client_configure_full(ObClient *self, ObCorner anchor,
     client_try_configure(self, anchor, &x, &y, &w, &h,
                          &logicalw, &logicalh, user);
 
-    /* set the logical size */
-    SIZE_SET(self->logical_size, logicalw, logicalh);
+    /* set the logical size if things changed */
+    if (!(w == self->area.width && h == self->area.height))
+        SIZE_SET(self->logical_size, logicalw, logicalh);
 
     /* figure out if we moved or resized or what */
     moved = x != self->area.x || y != self->area.y;