AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 544265 – GDK assumes XFIXES extension

Browse Source 
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
This commit is contained in:
Matthias Clasen 2008-07-24 03:38:08 +00:00 committed by Matthias Clasen
parent 1adf1e6ef1
commit 4c7d351053
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-07-22 Matthias Clasen <mclasen@redhat.com> 2008-07-22 Matthias Clasen <mclasen@redhat.com>
* configure.in: Compare two content types, not content type * configure.in: Compare two content types, not content type

8
gdk/x11/gdkcursor-x11.c
View File

@ -40,6 +40,7 @@
#include "gdkprivate-x11.h" #include "gdkprivate-x11.h"
#include "gdkcursor.h" #include "gdkcursor.h"
#include "gdkdisplay-x11.h"
#include "gdkpixmap-x11.h" #include "gdkpixmap-x11.h"
#include "gdkx.h" #include "gdkx.h"
#include <gdk/gdkpixmap.h> #include <gdk/gdkpixmap.h>
@ -401,10 +402,15 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor)
Display *xdisplay; Display *xdisplay;
GdkCursorPrivate *private; GdkCursorPrivate *private;
Cursor new_cursor = None; Cursor new_cursor = None;
GdkDisplayX11 *display_x11;
private = (GdkCursorPrivate *) cursor; private = (GdkCursorPrivate *) cursor;
xdisplay = GDK_DISPLAY_XDISPLAY (private->display); xdisplay = GDK_DISPLAY_XDISPLAY (private->display);
display_x11 = GDK_DISPLAY_X11 (private->display);
if (!display_x11->have_xfixes)
return;
if (private->serial == theme_serial) if (private->serial == theme_serial)
return; return;