[gtk+/gestures: 173/173] widget: 3-way merge ate my g_object_ref()

[Carlos Garnacho <carlosg src gnome org>]

commit f106631ffd40c1ffa20082299be734b2fc01aaca
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri May 16 18:58:11 2014 +0200

    widget: 3-way merge ate my g_object_ref()
    
    Move it to the right place.

 gtk/gtkwidget.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index f28b29e..99b3dc6 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -7283,7 +7283,6 @@ _gtk_widget_get_controllers_evmask (GtkWidget *widget)
   GList *l;
 
   priv = widget->priv;
-  g_object_ref (widget);
 
   for (l = priv->event_controllers; l; l = l->next)
     {
@@ -7306,6 +7305,7 @@ _gtk_widget_run_controllers (GtkWidget           *widget,
   GList *l;
 
   priv = widget->priv;
+  g_object_ref (widget);
 
   l = priv->event_controllers;
   while (l != NULL)