Remove some unnecessary checks

diff --git a/ChangeLog b/ChangeLog
index ddb2739328e3403aa8e2767cd2a30d33df1ec646..8c1f5d8c71e6417032802200b2c214947b330ca0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
+       Remove unnecessary checks.  
+
 2006-02-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ddb2739328e3403aa8e2767cd2a30d33df1ec646..8c1f5d8c71e6417032802200b2c214947b330ca0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
+       Remove unnecessary checks.  
+
 2006-02-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working

diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index a346c1d5de9f3f3d37b9b1b3675f57b4fc7ab67e..da33b980f02639d88c9f0c9a333f2bf6e794c491 100644 (file)
--- 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);