Don't update blank cursors

svn path=/trunk/; revision=22208

diff --git a/ChangeLog b/ChangeLog
index b7f32cae234df38e3330492990c3ea698a61540b..8dffd056f86b160a4ef2911c06a8e36eeaac57dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * gtk/gtktreeview.c: (gtk_tree_view_class_init): Slightly

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