diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-06-26 04:58:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-06-26 04:58:33 +0000 |
| commit | 957743919b207e532649e1bfda112dc34dc4ca7b (patch) | |
| tree | 142b69afa0a3b39471f3a91ef92e72902e1e8326 /gtk/gtkstyle.c | |
| parent | e1a243138a6f15785319b857d18049c78a07fba4 (diff) | |
| download | gtk+-957743919b207e532649e1bfda112dc34dc4ca7b.tar.gz | |
Accept a NULL style.
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
* gtk/gtkiconfactory.c (gtk_icon_set_render_icon):
* gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL
style.
Diffstat (limited to 'gtk/gtkstyle.c')
| -rw-r--r-- | gtk/gtkstyle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index ca3d770cd5..75d7366e51 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -2164,7 +2164,7 @@ gtk_default_render_icon (GtkStyle *style, screen = gtk_widget_get_screen (widget); settings = gtk_settings_get_for_screen (screen); } - else if (style->colormap) + else if (style && style->colormap) { screen = gdk_colormap_get_screen (style->colormap); settings = gtk_settings_get_for_screen (screen); |