From 8bf4caf83ce12f0f754b42f6bd34b5fae4b9cbab Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Oct 2006 01:27:25 +0000 Subject: [PATCH] =?UTF-8?q?Set=20model=20in=20all=20cases.=20(#357791,=20A?= =?UTF-8?q?ndreas=20K=C3=B6hler)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-10-01 Matthias Clasen * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): Set model in all cases. (#357791, Andreas Köhler) --- ChangeLog | 5 +++++ gtk/gtktreeselection.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02ae89f178..3c7964a787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-01 Matthias Clasen + + * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): + Set model in all cases. (#357791, Andreas Köhler) + 2006-10-01 Tor Lillqvist * gtk/gtkfilesystemwin32.c: Same change as to gtkfilesystemunix.c. diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index e7aad5bff7..7b4b49f604 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -402,8 +402,8 @@ gtk_tree_selection_get_selected (GtkTreeSelection *selection, * Since: 2.2 **/ GList * -gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection, - GtkTreeModel **model) +gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection, + GtkTreeModel **model) { GList *list = NULL; GtkRBTree *tree = NULL; @@ -413,13 +413,13 @@ gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection, g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL); g_return_val_if_fail (selection->tree_view != NULL, NULL); + if (model) + *model = selection->tree_view->priv->model; + if (selection->tree_view->priv->tree == NULL || selection->tree_view->priv->tree->root == NULL) return NULL; - if (model) - *model = selection->tree_view->priv->model; - if (selection->type == GTK_SELECTION_NONE) return NULL; else if (selection->type != GTK_SELECTION_MULTIPLE)