--- rxvt-unicode/src/rxvt.h	2012/05/17 10:31:26	1.476
+++ rxvt-unicode/src/rxvt.h	2012/05/20 16:23:42	1.481
@@ -80,6 +80,7 @@
 # define HAVE_BG_PIXMAP 1
 #endif
 
+#include <ecb.h>
 #include "encoding.h"
 #include "rxvtutil.h"
 #include "rxvtfont.h"
@@ -238,36 +239,25 @@
 
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf;
-#  endif
 
   ~rxvt_image ()
   {
-#  ifdef HAVE_PIXBUF
     if (pixbuf)
       g_object_unref (pixbuf);
-#  endif
   }
 
   int width ()
   {
-#  ifdef HAVE_PIXBUF
     return gdk_pixbuf_get_width (pixbuf);
-#  endif
   }
   int height ()
   {
-#  ifdef HAVE_PIXBUF
     return gdk_pixbuf_get_height (pixbuf);
-#  endif
   }
+#  endif
+
   bool set_file (const char *file);
   bool set_geometry (const char *geom, bool update = false);
-  void set_default_geometry ()
-  {
-    h_scale = v_scale = defaultScale;
-    h_align = v_align = defaultAlign;
-    flags |= IM_IS_SIZE_SENSITIVE;
-  }
 };
 # endif
 #endif
@@ -833,6 +823,9 @@
 struct compose_char
 {
   unicode_t c1, c2; // any chars != NOCHAR are valid
+  #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
+  compose_char () = default;
+  #endif
   compose_char (unicode_t c1, unicode_t c2)
   : c1(c1), c2(c2)
   { }
@@ -1146,20 +1139,20 @@
   void bg_destroy ();
 
   enum {
-    BG_IS_VALID          = 1 <<  0,
+    BG_IS_VALID          = 1 << 0,
 
-    BG_TINT_SET          = 1 <<  5,
-    BG_TINT_BITAND       = 1 <<  6,
+    BG_IS_TRANSPARENT    = 1 << 1,
+    BG_NEEDS_REFRESH     = 1 << 2,
 
-    BG_HAS_RENDER        = 1 <<  7,
-    BG_HAS_RENDER_CONV   = 1 <<  8,
-    BG_CLIENT_RENDER     = 1 <<  9,
+    BG_HAS_RENDER        = 1 << 3,
+    BG_HAS_RENDER_CONV   = 1 << 4,
+    BG_CLIENT_RENDER     = 1 << 5,
 
-    BG_IS_TRANSPARENT    = 1 << 10,
-    BG_NEEDS_REFRESH     = 1 << 11,
+    BG_TINT_SET          = 1 << 6,
+    BG_TINT_BITAND       = 1 << 7,
   };
 
-  unsigned int bg_flags;
+  uint8_t bg_flags;
 
 # ifdef BG_IMAGE_FROM_FILE
   rxvt_image bg_image;