From f81f00ed6bae414349d6022a58c89d3a152030be Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 16 May 2014 18:58:11 +0200
Subject: [PATCH] widget: 3-way merge ate my g_object_ref()

Move it to the right place.
---
 gtk/gtkwidget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 9cb254d491..015184bf83 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -7284,7 +7284,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)
     {
@@ -7307,6 +7306,7 @@ _gtk_widget_run_controllers (GtkWidget           *widget,
   GList *l;
 
   priv = widget->priv;
+  g_object_ref (widget);
 
   l = priv->event_controllers;
   while (l != NULL)