From 1ba507f09fbc43235cdf5c9a5278bec7e7efa1e1 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 21 May 2007 12:05:57 +0000 Subject: [PATCH] removed redundant check. Mon May 21 13:58:32 2007 Tim Janik * gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check. svn path=/trunk/; revision=17885 --- ChangeLog | 5 ++++- gtk/gtkcombobox.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ed3f27e19..bfeaf49854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon May 21 13:58:32 2007 Tim Janik + + * gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check. + 2007-05-21 Tor Lillqvist * 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 * gtk/gtkpathbar.c: Add ATK names to the Up, Down, and Root diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 93e6b924cf..6d3af0ea01 100644 --- 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;