[maemo-commits] [maemo-commits] r11732 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-05-21 15:44:22 +0300 (Mon, 21 May 2007)
New Revision: 11732

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcombobox.c
Log:
2007-05-21  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkcombobox.c (gtk_combo_box_set_model): allow NULL models
	(forgotten merge from the 2.10.12 update).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-21 12:38:27 UTC (rev 11731)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-21 12:44:22 UTC (rev 11732)
@@ -1,3 +1,8 @@
+2007-05-21  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): allow NULL models
+	(forgotten merge from the 2.10.12 update).
+
 2007-05-21  Xan Lopez  <xan.lopez at nokia.com>
 
 	2007-04-28  Matthias Clasen  <mclasen at redhat.com>

Modified: projects/haf/trunk/gtk+/gtk/gtkcombobox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2007-05-21 12:38:27 UTC (rev 11731)
+++ projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2007-05-21 12:44:22 UTC (rev 11732)
@@ -4843,7 +4843,7 @@
                          GtkTreeModel *model)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_TREE_MODEL (model));
+  g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
 
   if (model == combo_box->priv->model)
     return;