diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-08-25 19:22:29 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-08-25 19:22:29 +0000 |
| commit | 446ebe3a77ad078ebf26019ed18d3f68871abd13 (patch) | |
| tree | e0f99f96111496ac8920852824ade16b24e47fe5 | |
| parent | 7f76b46139748d14d0bfdd180cd05ba7e4443e89 (diff) | |
| download | gtk+-446ebe3a77ad078ebf26019ed18d3f68871abd13.tar.gz | |
Handle theme == NULL.
2005-08-25 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme):
Handle theme == NULL.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkcursor-x11.c | 8 |
3 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2005-08-25 Owen Taylor <otaylor@redhat.com> + + * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): + Handle theme == NULL. + 2005-08-25 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 55eb8d14fc..43328682b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-25 Owen Taylor <otaylor@redhat.com> + + * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): + Handle theme == NULL. + 2005-08-25 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index c816b5d656..fb4f53b149 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -446,7 +446,8 @@ update_cursor (gpointer key, /** * gdk_x11_display_set_cursor_theme: * @display: a #GdkDisplay - * @theme: the name of the cursor theme to use + * @theme: the name of the cursor theme to use, or %NULL to unset + * a previously set value * @size: the cursor size to use * * Sets the cursor theme from which the images for cursor @@ -481,8 +482,9 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display, old_theme = XcursorGetTheme (xdisplay); old_size = XcursorGetDefaultSize (xdisplay); - if (old_size == size && - old_theme && strcmp (old_theme, theme) == 0) + if (old_size == size && + (old_theme == theme || + (old_theme && theme && strcmp (old_theme, theme) == 0))) return; theme_serial++; |