when an app tries to move to 0,0 and there is a strut there (java swing!), move it...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 968a4585a978063318f34b0515c81eaeacb240e8..83ea46f15d9a68402559f9002458d6496c4f72b9 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -345,9 +345,11 @@ void client_manage(Window window, ObPrompt *prompt)
             Rect *r;
 
             r = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS, NULL);
-            place.x = r->x;
-            place.y = r->y;
-            ob_debug("Moving buggy app from (0,0) to (%d,%d)", r->x, r->y);
+            if (r->x || r->y) {
+                place.x = r->x;
+                place.y = r->y;
+                ob_debug("Moving buggy app from (0,0) to (%d,%d)", r->x, r->y);
+            }
             g_slice_free(Rect, r);
         }
 
@@ -502,7 +504,7 @@ void client_manage(Window window, ObPrompt *prompt)
     client_set_list();
 
     /* free the ObAppSettings shallow copy */
-    g_free(settings);
+    g_slice_free(ObAppSettings, settings);
 
     ob_debug("Managed window 0x%lx plate 0x%x (%s)",
              window, self->frame->window, self->class);
@@ -536,7 +538,7 @@ ObClient *client_fake_manage(Window window)
              self->frame->size.top, self->frame->size.bottom);
 
     /* free the ObAppSettings shallow copy */
-    g_free(settings);
+    g_slice_free(ObAppSettings, settings);
 
     return self;
 }
@@ -702,7 +704,7 @@ void client_fake_unmanage(ObClient *self)
     /* this is all that got allocated to get the decorations */
 
     frame_free(self->frame);
-    g_free(self);
+    g_slice_free(ObClient, self);
 }
 
 static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
@@ -722,7 +724,7 @@ static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
 
     /* This is focus stealing prevention */
     ob_debug_type(OB_DEBUG_FOCUS,
-                  "Want to focus new window 0x%x at time %u "
+                  "Want to focus window 0x%x at time %u "
                   "launched at %u (last user interaction time %u)",
                   self->window, steal_time, launch_time,
                   event_last_user_time);