diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-07-24 03:38:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-24 03:38:08 +0000 |
| commit | 4c7d351053c7de6033511990601cde5f7073990a (patch) | |
| tree | 6b1d6bb9850ca5466ba34a84e15c06a1486a030f /gdk | |
| parent | 1adf1e6ef1b1b20ef227b8ac74142963f6a95206 (diff) | |
| download | gtk+-4c7d351053c7de6033511990601cde5f7073990a.tar.gz | |
Bug 544265 – GDK assumes XFIXES extension
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.
svn path=/trunk/; revision=20901
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/gdkcursor-x11.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index 18431901a2..ef18c519dc 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -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 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor) 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; |