callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't update blank cursors

Browse Source 
svn path=/trunk/; revision=22208
This commit is contained in:
Matthias Clasen
2009-01-24 21:29:36 +00:00
parent 758cb60ee4
commit a576e0c9fa
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-01-23 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c (_gdk_x11_cursor_update_theme):
Don't update blank cursors.
2009-01-24 Claudio Saavedra <csaavedra@igalia.com> 2009-01-24 Claudio Saavedra <csaavedra@igalia.com>
* gtk/gtktreeview.c: (gtk_tree_view_class_init): Slightly * gtk/gtktreeview.c: (gtk_tree_view_class_init): Slightly

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

@ -50,10 +50,10 @@
static guint theme_serial = 0; static guint theme_serial = 0;
/* cursor_cache holds a cache of non-pixmap cursors to avoid expensive /* cursor_cache holds a cache of non-pixmap cursors to avoid expensive
* libXcursor searches, cursors are added to it but never removed. We make * libXcursor searches, cursors are added to it but only removed when
* the assumption that since there are a small number of GdkDisplay's and * their display is closed. We make the assumption that since there are
* a small number of cursor's that this list will stay small enough * a small number of display's and a small number of cursor's that this
* not to be a problem. * list will stay small enough not to be a problem.
*/ */
static GSList* cursor_cache = NULL; static GSList* cursor_cache = NULL;
@ -575,6 +575,9 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor)
if (private->xcursor != None) if (private->xcursor != None)
{ {
if (cursor->type == GDK_BLANK_CURSOR)
return;
if (cursor->type == GDK_CURSOR_IS_PIXMAP) if (cursor->type == GDK_CURSOR_IS_PIXMAP)
{ {
if (private->name) if (private->name)