Clear the iter instead of returning it unmodified. (#154186, Jonathan

2004-10-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeselection.c (gtk_tree_selection_get_selected): Clear
	the iter instead of returning it unmodified. (#154186, Jonathan Blandford)

diff --git a/ChangeLog b/ChangeLog
index 9838fdf3020d6abbd433849539c307b125a0854c..5265afbc949c7ec499c0aa570b1172dced2cc7dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeselection.c (gtk_tree_selection_get_selected): Clear
+       the iter instead of returning it unmodified. (#154186, Jonathan Blandford)
+
        * gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_focus): Pop up
        the completions again after tab.  (#147700, Jens Bech Madsen)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9838fdf3020d6abbd433849539c307b125a0854c..5265afbc949c7ec499c0aa570b1172dced2cc7dd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeselection.c (gtk_tree_selection_get_selected): Clear
+       the iter instead of returning it unmodified. (#154186, Jonathan Blandford)
+
        * gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_focus): Pop up
        the completions again after tab.  (#147700, Jens Bech Madsen)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9838fdf3020d6abbd433849539c307b125a0854c..5265afbc949c7ec499c0aa570b1172dced2cc7dd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeselection.c (gtk_tree_selection_get_selected): Clear
+       the iter instead of returning it unmodified. (#154186, Jonathan Blandford)
+
        * gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_focus): Pop up
        the completions again after tab.  (#147700, Jens Bech Madsen)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9838fdf3020d6abbd433849539c307b125a0854c..5265afbc949c7ec499c0aa570b1172dced2cc7dd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeselection.c (gtk_tree_selection_get_selected): Clear
+       the iter instead of returning it unmodified. (#154186, Jonathan Blandford)
+
        * gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_focus): Pop up
        the completions again after tab.  (#147700, Jens Bech Madsen)
 

diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index c2deab07737142bd08ead16037b7b64907fe1fce..07d55b4e81a1f146852ba4dc81f16d905c68a00a 100644 (file)
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -364,6 +364,10 @@ gtk_tree_selection_get_selected (GtkTreeSelection  *selection,
   g_return_val_if_fail (selection->type != GTK_SELECTION_MULTIPLE, FALSE);
   g_return_val_if_fail (selection->tree_view != NULL, FALSE);
 
+  /* Clear the iter */
+  if (iter)
+    memset (iter, 0, sizeof (GtkTreeIter));
+
   if (model)
     *model = selection->tree_view->priv->model;