Merge branch 'backport' into work

Conflicts:

	openbox/frame.c

diff --cc obrender/image.c
Simple merge

diff --cc openbox/frame.c
index 084f3f6accd60c6040f6a6adf6bcf7044de93b1e,67adb40535e113a1f23676746d93efeb5852e39a..8835c6326b15836e499b39b3fc5046437d92ec9f
--- 1/openbox/frame.c
--- 2/openbox/frame.c
+++ b/openbox/frame.c
@@@ -861,10 -862,12 +861,12 @@@ void frame_adjust_area(ObFrame *self, g
          if (focus_cycle_target == self->client)
              focus_cycle_update_indicator(self->client);
      }
-     if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
+     if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR) &&
+         self->label_width)
+     {
 -        XResizeWindow(ob_display, self->label, self->label_width,
 +        XResizeWindow(obt_display, self->label, self->label_width,
                        ob_rr_theme->label_height);
- 
+     }
  }
  
  static void frame_adjust_cursors(ObFrame *self)