[gtk+] Avoid another revert conflict



commit fd62353e2519e2d222f155f24264c0aebc7e2e6c
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jun 1 10:11:14 2014 -0400

    Avoid another revert conflict
    
    Moving this bit up a few lines lets the following revert apply
    cleanly.

 gtk/gtktreeview.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 868af44..8dd4e2b 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;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]