merge 7342-45 from trunk

diff --git a/CHANGELOG b/CHANGELOG
index 1bb196b9cd39cded248c677498cb38236ba146b9..8f2939180fc4e155ddb9fc924b2bd25f27db4ace 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,19 @@
 3.4:
   * Add Indian Bengali translation
+  * Updated Italian translation
+  * Small updates to Czech, Estonian, Norwegian, and German translations
   * Removed out-of-date Japanese translation (ja.po)
   * Removed out-of-date Croatian translation (hr.po)
+  * Allow parentrelative theme textures to have borders and bevels
   * Add new theme elements: window.active.title.separator.color and
     window.inactive.title.separator.color  (note that globbing might set these
     properties when you didnt mean to)
   * Add new underMouse focus option
   * Rename new theme element menu.items.activedisabled to
     menu.items.active.disabled for consistency with other elements
+  * Improvements to smart placement - especially with xinerama (Twinview)
+  * Fix bug #3196 - Unable to alt-tab away from full-screen windows
+  * Fix crash in parsing empty xml fields
   * Fix left and right contexts resizing the wrong way in the example mouse
     focus config file
   * Fix so dock doesn't auto-hide when the mouse is inside it (over top of a

diff --git a/openbox/place.c b/openbox/place.c
index f1409be606b5bc20cc0f71dbecda73ffbc96b43a..ea131bea3e1e73de60d99e05633436f144c77c4f 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -268,7 +268,10 @@ typedef enum
 } ObSmartType;
 
 #define SMART_IGNORE(placer, c) \
-    (placer == c || c->shaded || !client_normal(c) || !c->frame->visible || \
+    (placer == c || c->shaded || !c->frame->visible || \
+     c->type == OB_CLIENT_TYPE_SPLASH || c->type == OB_CLIENT_TYPE_DESKTOP || \
+     ((c->type == OB_CLIENT_TYPE_MENU || c->type == OB_CLIENT_TYPE_TOOLBAR) &&\
+      client_has_parent(c)) || \
      (c->desktop != DESKTOP_ALL && \
       c->desktop != (placer->desktop == DESKTOP_ALL ? \
                      screen_desktop : placer->desktop)))