free temporary paths after usage (patch from maemo-gtk),

2006-02-08  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_ref_path),
	(gtk_tree_model_filter_unref_path): free temporary paths after
	usage (patch from maemo-gtk),
	(gtk_tree_model_filter_clear_cache): fix little typo in the docs
	(patch from maemo-gtk).

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): remove
	stale FIXME.

diff --git a/ChangeLog b/ChangeLog
index 845f9e46cfcaf0f908b0e5a4b61ffa4b83269d4f..3718f16b683ef0ae1158899554a0af3c827be251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-08  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_ref_path),
+       (gtk_tree_model_filter_unref_path): free temporary paths after
+       usage (patch from maemo-gtk),
+       (gtk_tree_model_filter_clear_cache): fix little typo in the docs
+       (patch from maemo-gtk).
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): remove
+       stale FIXME.
+
 2006-02-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 845f9e46cfcaf0f908b0e5a4b61ffa4b83269d4f..3718f16b683ef0ae1158899554a0af3c827be251 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2006-02-08  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_ref_path),
+       (gtk_tree_model_filter_unref_path): free temporary paths after
+       usage (patch from maemo-gtk),
+       (gtk_tree_model_filter_clear_cache): fix little typo in the docs
+       (patch from maemo-gtk).
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): remove
+       stale FIXME.
+
 2006-02-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 0895d6d1fea936f7e6dc429decdf1bdf1f9cf2ff..d34b3269b849fdbb21d61f731d76164ebd8e8927 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -2818,6 +2818,8 @@ gtk_tree_model_filter_ref_path (GtkTreeModelFilter *filter,
       gtk_tree_model_ref_node (GTK_TREE_MODEL (filter->priv->child_model), &iter);
       gtk_tree_path_up (p);
     }
+
+  gtk_tree_path_free (p);
 }
 
 static void
@@ -2837,6 +2839,8 @@ gtk_tree_model_filter_unref_path (GtkTreeModelFilter *filter,
       gtk_tree_model_unref_node (GTK_TREE_MODEL (filter->priv->child_model), &iter);
       gtk_tree_path_up (p);
     }
+
+  gtk_tree_path_free (p);
 }
 
 static void
@@ -3344,7 +3348,7 @@ gtk_tree_model_filter_refilter (GtkTreeModelFilter *filter)
  * gtk_tree_model_ref_node(). This might be useful if the child model
  * being filtered is static (and doesn't change often) and there has been
  * a lot of unreffed access to nodes. As a side effect of this function,
- * all unreffed itters will be invalid.
+ * all unreffed iters will be invalid.
  *
  * Since: 2.4
  */

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index f8df268b17d8fc041b032e4419dedca80c9ab2f9..1b89e460a285dcde576e8fbbba6c265abb436943 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -767,7 +767,6 @@ gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *s_model,
   gtk_tree_path_free (path);
 }
 
-/* FIXME: I still have doubts if this works */
 static void
 gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
                                 GtkTreePath  *s_path,