diff --git a/ChangeLog b/ChangeLog index 9838fdf302..5265afbc94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-06 Matthias Clasen + * 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 9838fdf302..5265afbc94 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-06 Matthias Clasen + * 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 9838fdf302..5265afbc94 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-06 Matthias Clasen + * 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 9838fdf302..5265afbc94 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-06 Matthias Clasen + * 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 c2deab0773..07d55b4e81 100644 --- 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;