[maemo-commits] [maemo-commits] r9377 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-01-28 16:52:17 +0200 (Sun, 28 Jan 2007)
New Revision: 9377

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreemodelfilter.c
Log:
2007-01-28  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreemodelfilter.c: conditionalize with MAEMO_CHANGES.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-28 14:19:07 UTC (rev 9376)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-28 14:52:17 UTC (rev 9377)
@@ -1,5 +1,9 @@
 2007-01-28  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtktreemodelfilter.c: conditionalize with MAEMO_CHANGES.
+
+2007-01-28  Kristian Rietveld  <kris at imendio.com>
+
 	* gdk/x11/gdkwindow-x11.c (set_initial_hints): only declare
 	propmode when MAEMO_CHANGES is enabled.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreemodelfilter.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreemodelfilter.c	2007-01-28 14:19:07 UTC (rev 9376)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreemodelfilter.c	2007-01-28 14:52:17 UTC (rev 9377)
@@ -1586,10 +1586,12 @@
   level = FILTER_LEVEL (iter.user_data);
   elt = FILTER_ELT (iter.user_data2);
 
-  /* MAEMO START */
+#ifdef MAEMO_CHANGES
   /* FIXME: see NB#45767 */
   g_return_if_fail (elt->visible);
-  /* MAEMO END */
+#else /* !MAEMO_CHANGES */
+  g_assert (elt->visible);
+#endif /* !MAEMO_CHANGES */
 
   /* If this node is referenced and has children, build the level so we
    * can monitor it for changes.
@@ -1611,16 +1613,19 @@
   GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
   GtkTreePath *path;
   GtkTreeIter iter;
-  /* MAEMO START */
-  FilterElt *elt, *parent = NULL;
-  FilterLevel *level, *parent_level = NULL;
-  /* MAEMO END */
+  FilterElt *elt, *parent;
+  FilterLevel *level, *parent_level;
   gboolean emit_child_toggled = FALSE;
   gint offset;
   gint i;
 
   g_return_if_fail (c_path != NULL);
 
+#ifdef MAEMO_CHANGES
+  parent = NULL;
+  parent_level = NULL;
+#endif /* MAEMO_CHANGES */
+
   /* special case the deletion of an ancestor of the virtual root */
   if (filter->priv->virtual_root &&
       (gtk_tree_path_is_ancestor (c_path, filter->priv->virtual_root) ||