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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.340 by sf-exg, Sun Dec 12 19:30:10 2010 UTC vs.
Revision 1.341 by sf-exg, Sun Dec 12 23:13:29 2010 UTC

     if (xa[prop_id])
       {
         int aformat;
         unsigned long nitems, bytes_after;
         Atom atype;
-        unsigned char *prop = NULL;
+        unsigned char *prop;
         int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
                                          0L, 1L, False, XA_PIXMAP, &atype, &aformat,
                                          &nitems, &bytes_after, &prop);
-        if (result == Success && prop && atype == XA_PIXMAP)
+        if (result == Success)
+          {
+            if (atype == XA_PIXMAP)
-          pixmap = *(Pixmap *)prop;
+              pixmap = *(Pixmap *)prop;
-        XFree (prop);
+            XFree (prop);
+          }
       }
   return pixmap;
 }

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