From b58d9cdc85a7d68f31ccefd9600ea1056095f79b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 14 Feb 2006 13:50:03 +0000 Subject: [PATCH] Remove some unnecessary checks --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkcolorbutton.c | 6 ++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddb2739328..8c1f5d8c71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-14 Matthias Clasen + + * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize): + Remove unnecessary checks. + 2006-02-12 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ddb2739328..8c1f5d8c71 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-02-14 Matthias Clasen + + * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize): + Remove unnecessary checks. + 2006-02-12 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index a346c1d5de..da33b980f0 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -408,8 +408,7 @@ gtk_color_button_realize (GtkWidget *widget) GTK_WIDGET_CLASS (parent_class)->realize (widget); - if (color_button->priv->gc == NULL) - color_button->priv->gc = gdk_gc_new (widget->window); + color_button->priv->gc = gdk_gc_new (widget->window); render (color_button); } @@ -419,8 +418,7 @@ gtk_color_button_unrealize (GtkWidget *widget) { GtkColorButton *color_button = GTK_COLOR_BUTTON (widget); - if (color_button->priv->gc) - g_object_unref (color_button->priv->gc); + g_object_unref (color_button->priv->gc); color_button->priv->gc = NULL; GTK_WIDGET_CLASS (parent_class)->unrealize (widget);