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
This commit is contained in:
Tim Janik 2007-05-21 12:05:57 +00:00 committed by Tim Janik
parent cfa1c6ca6a
commit 1ba507f09f
2 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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;