merge r7493-7498 from trunk

diff --git a/CHANGELOG b/CHANGELOG
index b22f791d1c3b091ff1933281463c1f4120662307..be583fc4d30e5fff04fa2dfda8d281541ef255db 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,21 @@
+3.4.2:
+  * Add ability to set the bevel strength in themes
+  * Fix for focusLast with omnipresent windows
+  * Cache pipe menus while the menus are open
+  * Allow non-interactive directional focus key bindings
+  * Change how nested interactive key bindings work (it stays in the key chain,
+    like chroot, until you end the interactive action)
+  * Fix for gtk apps trying to get focus - mostly nullify focus stealing
+    prevention (Fixes Tilda)
+  * Send ConfigureNotify always on ConfigureRequest (Previous emacs fix
+    makes this possible now)
+  * Fix RelativeResize action for right/bottom edges
+  * Remove SCIM from the default autostart.sh - it has caused problems with
+    some (buggy) panels, such as pypanel
+  * Fix the titlebar changing to non-focused when iconifying a window with
+    animation
+  * Use the new osd theme hints for the dock, rather than the titlebar hints
+
 3.4.1:
   * Add Vietnamese translation
   * Add Japanese translation

diff --git a/configure.ac b/configure.ac
index 7bf737e31eee07e5f92b080870acfa1f93108bc2..c06fdaa619fe24997a45e1ffe33ce0d9133f81a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.4.1], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.4.2], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,9 +15,9 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 OB_MAJOR_VERSION=3
 OB_MINOR_VERSION=4
-OB_MICRO_VERSION=14
-OB_INTERFACE_AGE=1
-OB_BINARY_AGE=2
+OB_MICRO_VERSION=15
+OB_INTERFACE_AGE=0
+OB_BINARY_AGE=0
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)

diff --git a/render/render.h b/render/render.h
index 8731c8524771a7fdcfb37c74fa432cdec5b157a7..cf0f7eddbf45eaba28c56063bf3dd919bc92bbb0 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -117,14 +117,14 @@ struct _RrSurface {
     RrColor *bevel_dark; 
     RrColor *bevel_light;
     RrColor *interlace_color;
-    gint bevel_dark_adjust;  /* 0-255, default is 64 */
-    gint bevel_light_adjust; /* 0-255, default is 128 */
     gboolean interlaced;
     gboolean border;
     RrAppearance *parent;
     gint parentx;
     gint parenty;
     RrPixel32 *pixel_data;
+    gint bevel_dark_adjust;  /* 0-255, default is 64 */
+    gint bevel_light_adjust; /* 0-255, default is 128 */
 };
 
 struct _RrTextureText {