From fd62353e2519e2d222f155f24264c0aebc7e2e6c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 1 Jun 2014 10:11:14 -0400
Subject: [PATCH] Avoid another revert conflict

Moving this bit up a few lines lets the following revert apply
cleanly.
---
 gtk/gtktreeview.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 868af44cf6..8dd4e2be79 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -475,12 +475,12 @@ struct _GtkTreeViewPrivate
   guint hover_expand : 1;
   guint imcontext_changed : 1;
 
+  guint in_scroll : 1;
+
   guint rubber_banding_enable : 1;
 
   guint in_grab : 1;
 
-  guint in_scroll : 1;
-
   /* Whether our key press handler is to avoid sending an unhandled binding to the search entry */
   guint search_entry_avoid_unhandled_binding : 1;