widget: 3-way merge ate my g_object_ref()

Move it to the right place.
This commit is contained in:
Carlos Garnacho 2014-05-16 18:58:11 +02:00
parent d351c52114
commit f81f00ed6b

View File

@ -7284,7 +7284,6 @@ _gtk_widget_get_controllers_evmask (GtkWidget *widget)
GList *l; GList *l;
priv = widget->priv; priv = widget->priv;
g_object_ref (widget);
for (l = priv->event_controllers; l; l = l->next) for (l = priv->event_controllers; l; l = l->next)
{ {
@ -7307,6 +7306,7 @@ _gtk_widget_run_controllers (GtkWidget *widget,
GList *l; GList *l;
priv = widget->priv; priv = widget->priv;
g_object_ref (widget);
l = priv->event_controllers; l = priv->event_controllers;
while (l != NULL) while (l != NULL)