From 957743919b207e532649e1bfda112dc34dc4ca7b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 26 Jun 2004 04:58:33 +0000 Subject: [PATCH] Accept a NULL style. Sat Jun 26 00:40:02 2004 Matthias Clasen * 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. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkiconfactory.c | 4 ++-- gtk/gtkstyle.c | 2 +- 6 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c29953e0e..64977af0c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jun 26 00:40:02 2004 Matthias Clasen + + * 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. + Sat Jun 26 00:04:36 2004 Matthias Clasen * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c29953e0e..64977af0c3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sat Jun 26 00:40:02 2004 Matthias Clasen + + * 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. + Sat Jun 26 00:04:36 2004 Matthias Clasen * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8c29953e0e..64977af0c3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sat Jun 26 00:40:02 2004 Matthias Clasen + + * 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. + Sat Jun 26 00:04:36 2004 Matthias Clasen * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c29953e0e..64977af0c3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sat Jun 26 00:40:02 2004 Matthias Clasen + + * 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. + Sat Jun 26 00:04:36 2004 Matthias Clasen * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index b1accbc006..52b50e8642 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1595,7 +1595,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, if (widget && gtk_widget_has_screen (widget)) screen = gtk_widget_get_screen (widget); - else if (style->colormap) + else if (style && style->colormap) screen = gdk_colormap_get_screen (style->colormap); else { @@ -1768,7 +1768,7 @@ gtk_icon_set_render_icon (GtkIconSet *icon_set, GdkPixbuf *icon; g_return_val_if_fail (icon_set != NULL, NULL); - g_return_val_if_fail (GTK_IS_STYLE (style), NULL); + g_return_val_if_fail (style == NULL || GTK_IS_STYLE (style), NULL); if (icon_set->sources == NULL) return render_fallback_image (style, direction, state, size, widget, detail); 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);