Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 14 Jan 2010 21:19:57 +0000 (16:19 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Jan 2010 21:19:57 +0000 (16:19 -0500)
Conflicts:

openbox/frame.c

1  2 
obrender/image.c
openbox/frame.c

Simple merge
diff --cc 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)