removed redundant check.

Mon May 21 13:58:32 2007  Tim Janik  <timj@imendio.com>

        * gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check.

svn path=/trunk/; revision=17885

diff --git a/ChangeLog b/ChangeLog
index 8ed3f27e19b4b212cea83a8e5e9726cee078ec8b..bfeaf49854e532acd248b0720381009545f925d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 21 13:58:32 2007  Tim Janik  <timj@imendio.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check.
+
 2007-05-21  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkscalebutton.c (gtk_scale_popup): Make it work better with
@@ -170,7 +174,6 @@
        #425138 (Reported by Michail Crayson). Some code simplifications.
        (gtk_notebook_draw_arrow): code style fix.
 
->>>>>>> .r17863
 2007-05-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpathbar.c: Add ATK names to the Up, Down, and Root

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 93e6b924cfb7ea617d4d457ad23322eb1494fc57..6d3af0ea0147007ea10b97f3573749af302db9c1 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4807,7 +4807,7 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
                          GtkTreeModel *model)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
+  g_return_if_fail (GTK_IS_TREE_MODEL (model));
 
   if (model == combo_box->priv->model)
     return;