tree model sort: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
This commit is contained in:
Matthias Clasen 2015-05-30 21:29:21 -04:00
parent bed26edfd1
commit 3dd7f12f78

View File

@ -1092,12 +1092,11 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
gint *new_order, gint *new_order,
gpointer data) gpointer data)
{ {
SortElt *elt;
SortLevel *level; SortLevel *level;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreePath *path;
gint *tmp_array; gint *tmp_array;
int i, length; int i, length;
GtkTreePath *path;
GSequenceIter *siter, *end_siter; GSequenceIter *siter, *end_siter;
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data); GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreeModelSortPrivate *priv = tree_model_sort->priv; GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
@ -1113,6 +1112,8 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
} }
else else
{ {
SortElt *elt;
path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE); path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
if (path == NULL) if (path == NULL)
return; return;