From 3dd7f12f783e9442ccac327f280d225b06bdb6ba Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 30 May 2015 21:29:21 -0400
Subject: [PATCH] tree model sort: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
---
 gtk/gtktreemodelsort.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 2a7de1e434..6cef856463 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1092,12 +1092,11 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 				    gint         *new_order,
 				    gpointer      data)
 {
-  SortElt *elt;
   SortLevel *level;
   GtkTreeIter iter;
+  GtkTreePath *path;
   gint *tmp_array;
   int i, length;
-  GtkTreePath *path;
   GSequenceIter *siter, *end_siter;
   GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
@@ -1113,6 +1112,8 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
     }
   else
     {
+      SortElt *elt;
+
       path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
       if (path == NULL)
 	return;