--- rxvt-unicode/src/rxvttoolkit.C	2010/03/31 13:14:51	1.107
+++ rxvt-unicode/src/rxvttoolkit.C	2010/12/14 08:01:51	1.110
@@ -35,7 +35,7 @@
 # include <X11/extensions/Xrender.h>
 #endif
 
-const char *const xa_names[] =
+static const char *const xa_names[] =
 {
   "TEXT",
   "COMPOUND_TEXT",
@@ -364,14 +364,14 @@
                               (unsigned char **)&val) == Success
           && actual_type == XA_STRING
           && actual_format == 8)
-         displayResource = val;
-       else
-         {
-           displayResource = 0;
-
-           if (val)
-             XFree(val);
-         }
+        displayResource = val;
+      else
+        {
+          displayResource = 0;
+
+          if (val)
+            XFree (val);
+        }
 
 #if XLIB_ILLEGAL_ACCESS
       dpy->xdefaults = displayResource;
@@ -530,10 +530,10 @@
   if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
                           False, XA_ATOM, &actual_type, &actual_format,
                           &nitems, &bytes_after, (unsigned char **)&atoms)
-      != Success )
+      != Success)
     return;
 
-  if (actual_type == XA_ATOM  && actual_format == 32)
+  if (actual_type == XA_ATOM && actual_format == 32)
     for (int i = 0; i < nitems; i++)
       if (XGetSelectionOwner (dpy, atoms[i]))
         {
@@ -886,19 +886,3 @@
   );
 }
 
-#if TRACE_PIXMAPS
-# undef XCreatePixmap
-# undef XFreePixmap
-Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
-{
-  Pixmap res = XCreatePixmap (dpy, r, w, h, d);
-  fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
-  return res;
-}
-
-void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
-{
-  fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
-  XFreePixmap (dpy,p);
-}
-#endif