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

Handle theme == NULL.

Browse Source 
2005-08-25  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme):
        Handle theme == NULL.
This commit is contained in:
Owen Taylor 2005-08-25 19:22:29 +00:00 committed by Owen Taylor
parent 7f76b46139
commit 446ebe3a77
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

5
ChangeLog.pre-2-10
View File

@ -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

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

@ -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++;