--- rxvt-unicode/src/main.C	2012/01/18 11:47:51	1.367
+++ rxvt-unicode/src/main.C	2012/06/03 17:48:28	1.375
@@ -38,9 +38,9 @@
 
 #include <limits>
 
-#include <cassert>
-#include <csignal>
-#include <cstring>
+#include <assert.h>
+#include <signal.h>
+#include <string.h>
 
 #include <termios.h>
 
@@ -48,9 +48,7 @@
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
+# include <locale.h>
 #endif
 
 struct termios rxvt_term::def_tio;
@@ -352,7 +350,7 @@
 }
 
 void
-rxvt_term::set_option (uint8_t opt, bool set)
+rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
 {
   if (!opt)
     return;
@@ -378,7 +376,7 @@
 }
 
 #if !ENABLE_MINIMAL
-static void
+static void ecb_cold
 print_x_error (Display *dpy, XErrorEvent *event)
 {
     char buffer[BUFSIZ];
@@ -426,7 +424,7 @@
 }
 #endif
 
-int
+int ecb_cold
 rxvt_xerror_handler (Display *display, XErrorEvent *event)
 {
   if (GET_R->allowedxerror == -1)
@@ -445,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",
@@ -575,6 +573,10 @@
   XSetIOErrorHandler (rxvt_xioerror_handler);
 
   XrmInitialize ();
+
+#ifdef HAVE_PIXBUF
+  g_type_init ();
+#endif
 }
 
 /*----------------------------------------------------------------------*/
@@ -768,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++)
@@ -1530,10 +1531,8 @@
   if (Input_Context)
     return;
 
-#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])
     SET_LOCALE (rs[Rs_imLocale]);
-#endif
 
   p = rs[Rs_inputMethod];
   if (p && *p)
@@ -1570,11 +1569,9 @@
   if (im_get_ic ("@im=none"))
     goto done;
 
-done: ;
-#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
+done:
   if (rs[Rs_imLocale])
     SET_LOCALE (locale);
-#endif
 }
 
 void
@@ -1629,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