summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-10-06 18:47:57 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-10-06 18:47:57 +0000
commiteb8ae3642c7e92148ae3e02c9f034ed687ffcab8 (patch)
tree07eeec0cdd2dbf9dc9dd112cd5de316ac1989325
parent46f404dd2dc3cbdfde081509d5430f76e1a9dcf3 (diff)
downloadgdk-pixbuf-eb8ae3642c7e92148ae3e02c9f034ed687ffcab8.tar.gz
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)
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--ChangeLog.pre-2-63
-rw-r--r--ChangeLog.pre-2-83
-rw-r--r--gtk/gtktreeselection.c4
5 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bda2f0678..0f056c54b 100644
--- 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 bda2f0678..0f056c54b 100644
--- 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 bda2f0678..0f056c54b 100644
--- 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 bda2f0678..0f056c54b 100644
--- 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 ab45ece6f..b42c39cd5 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -363,6 +363,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;