fix some failed merging and merge r6034 from trunk

diff --git a/openbox/place.c b/openbox/place.c
index 1ac295c..8003270 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -282,7 +282,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
             if (WINDOW_IS_CLIENT(it->data)) {
                 c = it->data;
-                if (c->fullscreen)
+                if (c->fullscreen || (c->max_vert && c->max_horz))
                     continue;
             } else
                 continue;
@@ -306,7 +306,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y,
 
                 if (WINDOW_IS_CLIENT(it->data)) {
                     c = it->data;
-                    if (c->fullscreen)
+                    if (c->fullscreen || (c->max_vert && c->max_horz))
                         continue;
                 } else
                     continue;

diff --git a/tests/grav.c b/tests/grav.c
index 2cbc300..5aeed8b 100644 (file)
--- a/tests/grav.c
+++ b/tests/grav.c
@@ -49,14 +49,9 @@ int main () {
   XMapWindow(display, win);
   XFlush(display);
 
-<<<<<<< .working
-  XMoveWindow(display, win, 960-1, 600-1);
-
-=======
   XMoveResizeWindow(display, win, 960-1, 600-1, 600, 150);
   /*XResizeWindow(display, win, 600, 150);*/
 
->>>>>>> .merge-right.r5963
   XSelectInput(display, win, ExposureMask | StructureNotifyMask);
 
   while (1) {