diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-27 14:30:47 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-27 14:33:32 -0400 |
| commit | 3bb404f40c97f757988551f23fa1434d01000f54 (patch) | |
| tree | a00e58e42ca5351d73b310116d87dee97031e0d7 /gtk/gtkeventcontroller.c | |
| parent | e4680d64a0864651557fbf8e04db409c827641a7 (diff) | |
| download | gtk+-3bb404f40c97f757988551f23fa1434d01000f54.tar.gz | |
Don't assert in gtk_event_controller_constructed
This prevents some of our generic object implementation tests
from working with gesture objects. Instead, add g_return_if_fail
checks in all the gesture constructors.
Diffstat (limited to 'gtk/gtkeventcontroller.c')
| -rw-r--r-- | gtk/gtkeventcontroller.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkeventcontroller.c b/gtk/gtkeventcontroller.c index ba3c7c6d1d..b674380e19 100644 --- a/gtk/gtkeventcontroller.c +++ b/gtk/gtkeventcontroller.c @@ -115,8 +115,8 @@ gtk_event_controller_constructed (GObject *object) GtkEventControllerPrivate *priv; priv = gtk_event_controller_get_instance_private (controller); - g_assert (priv->widget != NULL); - _gtk_widget_add_controller (priv->widget, controller); + if (priv->widget) + _gtk_widget_add_controller (priv->widget, controller); } static void @@ -126,7 +126,8 @@ gtk_event_controller_dispose (GObject *object) GtkEventControllerPrivate *priv; priv = gtk_event_controller_get_instance_private (controller); - _gtk_widget_remove_controller (priv->widget, controller); + if (priv->widget) + _gtk_widget_remove_controller (priv->widget, controller); } static void |