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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.373 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.375 by sf-exg, Sun Jun 3 17:48:28 2012 UTC

   old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
   // TODO: handle this with exceptions and tolerate the memory loss
   XSetIOErrorHandler (rxvt_xioerror_handler);
   XrmInitialize ();
+#ifdef HAVE_PIXBUF
+  g_type_init ();
+#endif
 }
 /*----------------------------------------------------------------------*/
 /*
  * window size/position calculations for XSizeHint and other storage.
 {
   Window cr;
   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
 rxvt_term::update_background ()
 {

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