[gtk+/gestures: 173/202] widget: 3-way merge ate my g_object_ref()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gestures: 173/202] widget: 3-way merge ate my g_object_ref()
- Date: Fri, 23 May 2014 18:10:55 +0000 (UTC)
commit f81f00ed6bae414349d6022a58c89d3a152030be
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 9cb254d..015184b 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]