projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz
[xscreensaver]
/
hacks
/
xpm-pixmap.c
diff --git
a/hacks/xpm-pixmap.c
b/hacks/xpm-pixmap.c
index 9493e093583823a41d29348d7699bb8f240d7e35..635a5018d0ea686bd115aaf1257700cf856dac3e 100644
(file)
--- a/
hacks/xpm-pixmap.c
+++ b/
hacks/xpm-pixmap.c
@@
-17,7
+17,7
@@
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
-#ifdef HAVE_
COCOA
+#ifdef HAVE_
JWXYZ
# include "jwxyz.h"
#else
# include <X11/Xlib.h>
# include "jwxyz.h"
#else
# include <X11/Xlib.h>
@@
-61,7
+61,9
@@
xpm_to_pixmap_1 (Display *dpy, Window window,
if (!initted)
{
#ifdef HAVE_GTK2
if (!initted)
{
#ifdef HAVE_GTK2
+#if !GLIB_CHECK_VERSION(2, 36 ,0)
g_type_init ();
g_type_init ();
+#endif
#endif /* HAVE_GTK2 */
gdk_pixbuf_xlib_init (dpy, screen_number (xgwa.screen));
xlib_rgb_init (dpy, xgwa.screen);
#endif /* HAVE_GTK2 */
gdk_pixbuf_xlib_init (dpy, screen_number (xgwa.screen));
xlib_rgb_init (dpy, xgwa.screen);