Only set the cursor size if it is != 0.

2006-01-25  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
	set the cursor size if it is != 0.

	* gtk/gtksettings.c (gtk_settings_class_init): Change the default value
	of gtk-cursor-theme-size to 0, meaning "use default".

diff --git a/ChangeLog b/ChangeLog
index b690b9328cea675b2e66115afbdf69d9a0b3deea..876eb05ee55e423d57be6fb77a4f4af862b436a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
+       set the cursor size if it is != 0.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Change the default value
+       of gtk-cursor-theme-size to 0, meaning "use default".
+
 2006-01-24  Kristian Rietveld  <kris@gtk.org>
 
        #322591, Jonathan Blandford.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b690b9328cea675b2e66115afbdf69d9a0b3deea..876eb05ee55e423d57be6fb77a4f4af862b436a6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
+       set the cursor size if it is != 0.
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Change the default value
+       of gtk-cursor-theme-size to 0, meaning "use default".
+
 2006-01-24  Kristian Rietveld  <kris@gtk.org>
 
        #322591, Jonathan Blandford.

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index f5e8d15ea80eb867bdb5fdd58130e6ce50a8a2ae..7162365cdc00c7586b03ed7b84b07d8480461b9f 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -451,8 +451,8 @@ update_cursor (gpointer key,
  * gdk_x11_display_set_cursor_theme:
  * @display: a #GdkDisplay
  * @theme: the name of the cursor theme to use, or %NULL to unset
- *         a previously set value
- * @size: the cursor size to use
+ *         a previously set value 
+ * @size: the cursor size to use, or 0 to keep the previous size
  *
  * Sets the cursor theme from which the images for cursor
  * should be taken. 
@@ -494,7 +494,8 @@ gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
   theme_serial++;
 
   XcursorSetTheme (xdisplay, theme);
-  XcursorSetDefaultSize (xdisplay, size);
+  if (size > 0)
+    XcursorSetDefaultSize (xdisplay, size);
     
   g_hash_table_foreach (display_x11->xid_ht, update_cursor, NULL);
 }

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 9f0c837f7d4a62b5094e56e14d99dcf8c375660e..5c15391521a177793e549ad6dbca64be8e00dc99 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -387,7 +387,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-cursor-theme-name",
                                                                  P_("Cursor theme name"),
-                                                                 P_("Name of the cursor theme to use"),
+                                                                 P_("Name of the cursor theme to use, or NULL to use the default theme"),
                                                                  NULL,
                                                                  GTK_PARAM_READWRITE),
                                              NULL);
@@ -396,8 +396,8 @@ gtk_settings_class_init (GtkSettingsClass *class)
   result = settings_install_property_parser (class,
                                             g_param_spec_int ("gtk-cursor-theme-size",
                                                               P_("Cursor theme size"),
-                                                              P_("Size to use for cursors"),
-                                                              0, 128, 24,
+                                                              P_("Size to use for cursors, or 0 to use the default size"),
+                                                              0, 128, 0,
                                                               GTK_PARAM_READWRITE),
                                             NULL);