--- rxvt-unicode/src/main.C	2012/01/19 15:08:55	1.370
+++ rxvt-unicode/src/main.C	2012/06/03 17:48:28	1.375
@@ -376,7 +376,7 @@
 }
 
 #if !ENABLE_MINIMAL
-static void
+static void ecb_cold
 print_x_error (Display *dpy, XErrorEvent *event)
 {
     char buffer[BUFSIZ];
@@ -424,7 +424,7 @@
 }
 #endif
 
-int
+int ecb_cold
 rxvt_xerror_handler (Display *display, XErrorEvent *event)
 {
   if (GET_R->allowedxerror == -1)
@@ -443,7 +443,7 @@
   return 0;
 }
 
-int
+int ecb_cold
 rxvt_xioerror_handler (Display *display)
 {
   rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
@@ -573,6 +573,10 @@
   XSetIOErrorHandler (rxvt_xioerror_handler);
 
   XrmInitialize ();
+
+#ifdef HAVE_PIXBUF
+  g_type_init ();
+#endif
 }
 
 /*----------------------------------------------------------------------*/
@@ -766,13 +770,12 @@
   fontset[0] = fs;
 
   prop = (*fs)[rxvt_fontset::firstFont]->properties ();
-  prop.height += lineSpace;
   prop.width += letterSpace;
 
   fs->set_prop (prop, false);
 
   fwidth  = prop.width;
-  fheight = prop.height;
+  fheight = prop.height + lineSpace;
   fbase   = prop.ascent;
 
   for (int style = 1; style < 4; style++)
@@ -1566,7 +1569,7 @@
   if (im_get_ic ("@im=none"))
     goto done;
 
-done: ;
+done:
   if (rs[Rs_imLocale])
     SET_LOCALE (locale);
 }
@@ -1623,28 +1626,6 @@
   XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
 }
 
-Pixmap
-rxvt_term::get_pixmap_property (Atom property)
-{
-  Pixmap pixmap = None;
-
-  int aformat;
-  unsigned long nitems, bytes_after;
-  Atom atype;
-  unsigned char *prop;
-  int result = XGetWindowProperty (dpy, display->root, property,
-                                   0L, 1L, False, XA_PIXMAP, &atype, &aformat,
-                                   &nitems, &bytes_after, &prop);
-  if (result == Success)
-    {
-      if (atype == XA_PIXMAP)
-        pixmap = *(Pixmap *)prop;
-      XFree (prop);
-    }
-
-  return pixmap;
-}
-
 #ifdef HAVE_BG_PIXMAP
 
 void