gtk+ r20901 - in trunk: . gdk/x11

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Jul 24 03:38:08 2008
New Revision: 20901
URL: http://svn.gnome.org/viewvc/gtk+?rev=20901&view=rev

Log:
2008-07-23  Matthias Clasen  <mclasen redhat com>

        Bug 544265 â GDK assumes XFIXES extension

        * gdk/x11/gdkcursor-x11.c (_gdk_x11_cursor_update_theme):
        Only call XFixes functions if the server has the extension.
        Reported by Ian Turner.


Modified:
   trunk/ChangeLog
   trunk/gdk/x11/gdkcursor-x11.c

Modified: trunk/gdk/x11/gdkcursor-x11.c
==============================================================================
--- trunk/gdk/x11/gdkcursor-x11.c	(original)
+++ trunk/gdk/x11/gdkcursor-x11.c	Thu Jul 24 03:38:08 2008
@@ -40,6 +40,7 @@
 
 #include "gdkprivate-x11.h"
 #include "gdkcursor.h"
+#include "gdkdisplay-x11.h"
 #include "gdkpixmap-x11.h"
 #include "gdkx.h"
 #include <gdk/gdkpixmap.h>
@@ -401,10 +402,15 @@
   Display *xdisplay;
   GdkCursorPrivate *private;
   Cursor new_cursor = None;
+  GdkDisplayX11 *display_x11;
 
   private = (GdkCursorPrivate *) cursor;
   xdisplay = GDK_DISPLAY_XDISPLAY (private->display);
-	  
+  display_x11 = GDK_DISPLAY_X11 (private->display);
+
+  if (!display_x11->have_xfixes)
+    return;
+
   if (private->serial == theme_serial)
     return;