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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-03-05 12:48:17 +0200 (Wed, 05 Mar 2008)
New Revision: 15247

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreemodelfilter.c
Log:
2008-03-05  Kristian Rietveld  <kris at imendio.com>

	Also committed upstream.  Fixes NB#78691.

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted):
	short-circuit in case an empty root level would be build (and thus
	directly destroyed) if no virtual root has been set.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-03-05 10:22:47 UTC (rev 15246)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-03-05 10:48:17 UTC (rev 15247)
@@ -1,3 +1,11 @@
+2008-03-05  Kristian Rietveld  <kris at imendio.com>
+
+	Also committed upstream.  Fixes NB#78691.
+
+	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted):
+	short-circuit in case an empty root level would be build (and thus
+	directly destroyed) if no virtual root has been set.
+
 2008-02-26  Michael Natterer  <mitch at imendio.com>
 
 	Merged from upstream, fixes the crash in NB#77296:

Modified: projects/haf/trunk/gtk+/gtk/gtktreemodelfilter.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreemodelfilter.c	2008-03-05 10:22:47 UTC (rev 15246)
+++ projects/haf/trunk/gtk+/gtk/gtktreemodelfilter.c	2008-03-05 10:48:17 UTC (rev 15247)
@@ -1397,6 +1397,11 @@
 
   if (!filter->priv->root)
     {
+      /* No point in building the level if this node is not visible */
+      if (!filter->priv->virtual_root
+          && !gtk_tree_model_filter_visible (filter, c_iter))
+        goto done;
+
       /* build level will pull in the new child */
       gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);