[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.C

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.110 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 UTC

 {
 }
 rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
 {
-  // it's actually faster to re-allocate every time. don't ask me
-  // why, but its likely no big deal there are no roundtrips
-  // (I think/hope).
-  if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
+  if (!scratch_area || w > scratch_w || h > scratch_h)
     {
       if (scratch_area)
         {
           XFreePixmap (dpy, scratch_area->drawable);
           delete scratch_area;
     return false;
   screen = DefaultScreen     (dpy);
   root   = DefaultRootWindow (dpy);
-  assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
+  assert (ARRAY_LENGTH(xa_names) == NUM_XA);
   XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
   XrmSetDatabase (dpy, get_resources (false));
 #ifdef POINTER_BLANK
   x_ev.stop ();
   flush_ev.stop ();
 #ifdef USE_XIM
   xims.clear ();
 #endif
+  XrmDestroyDatabase (XrmGetDatabase (dpy));
   XCloseDisplay (dpy);
 }
 #ifdef USE_XIM
 void rxvt_display::im_change_cb ()

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines