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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.52 by root, Sat Feb 18 15:48:23 2006 UTC vs.
Revision 1.54 by root, Sun Feb 19 16:53:49 2006 UTC

 #if XLIB_ILLEGAL_ACCESS
       if (dpy->xdefaults)
         XFree (dpy->xdefaults);
 #endif
-      if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER,
+      if (XGetWindowProperty (dpy, RootWindow(dpy, 0), XA_RESOURCE_MANAGER,
                               0L, 100000000L, False,
                               XA_STRING, &actual_type, &actual_format,
                               &nitems, &nremaining,
                               (unsigned char **)&val) == Success
           && actual_type == XA_STRING
 }
 void
 rxvt_color::free (rxvt_screen *screen)
 {
+  if (screen->visual->c_class == TrueColor)
+    return; // nothing to do
 #if XFT
   XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
 #else
   XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
 #endif

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