Don't crash if icon_theme_builtin_icons hasn't been initialized. (#128726,

Sun Dec  7 23:45:40 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
	icon_theme_builtin_icons hasn't been initialized.  (#128726, Diego
	Gonzalez)
This commit is contained in:
Matthias Clasen 2003-12-07 22:53:22 +00:00 committed by Matthias Clasen
parent 3774da6083
commit ba288650cd
6 changed files with 33 additions and 1 deletions

View File

@ -1,3 +1,9 @@
Sun Dec 7 23:45:40 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
icon_theme_builtin_icons hasn't been initialized. (#128726, Diego
Gonzalez)
2003-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

View File

@ -1,3 +1,9 @@
Sun Dec 7 23:45:40 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
icon_theme_builtin_icons hasn't been initialized. (#128726, Diego
Gonzalez)
2003-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

View File

@ -1,3 +1,9 @@
Sun Dec 7 23:45:40 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
icon_theme_builtin_icons hasn't been initialized. (#128726, Diego
Gonzalez)
2003-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

View File

@ -1,3 +1,9 @@
Sun Dec 7 23:45:40 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
icon_theme_builtin_icons hasn't been initialized. (#128726, Diego
Gonzalez)
2003-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

View File

@ -1,3 +1,9 @@
Sun Dec 7 23:45:40 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if
icon_theme_builtin_icons hasn't been initialized. (#128726, Diego
Gonzalez)
2003-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the

View File

@ -1252,7 +1252,9 @@ gtk_icon_theme_has_icon (GtkIconTheme *icon_theme,
if (g_hash_table_lookup_extended (priv->all_icons,
icon_name, NULL, NULL))
return TRUE;
if (g_hash_table_lookup_extended (icon_theme_builtin_icons,
if (icon_theme_builtin_icons &&
g_hash_table_lookup_extended (icon_theme_builtin_icons,
icon_name, NULL, NULL))
return TRUE;