[gtk+] Don't assert in gtk_event_controller_constructed
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Don't assert in gtk_event_controller_constructed
- Date: Tue, 27 May 2014 18:34:00 +0000 (UTC)
commit 3bb404f40c97f757988551f23fa1434d01000f54
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 27 14:30:47 2014 -0400
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.
gtk/gtkeventcontroller.c | 7 ++++---
gtk/gtkgesturedrag.c | 2 ++
gtk/gtkgesturelongpress.c | 2 ++
gtk/gtkgesturemultipress.c | 2 ++
gtk/gtkgesturerotate.c | 2 ++
gtk/gtkgestureswipe.c | 2 ++
gtk/gtkgesturezoom.c | 2 ++
7 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkeventcontroller.c b/gtk/gtkeventcontroller.c
index ba3c7c6..b674380 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
diff --git a/gtk/gtkgesturedrag.c b/gtk/gtkgesturedrag.c
index 3f8f1e1..0b53285 100644
--- a/gtk/gtkgesturedrag.c
+++ b/gtk/gtkgesturedrag.c
@@ -186,6 +186,8 @@ gtk_gesture_drag_init (GtkGestureDrag *gesture)
GtkGesture *
gtk_gesture_drag_new (GtkWidget *widget)
{
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
return g_object_new (GTK_TYPE_GESTURE_DRAG,
"widget", widget,
NULL);
diff --git a/gtk/gtkgesturelongpress.c b/gtk/gtkgesturelongpress.c
index 61e18d1..f2971b3 100644
--- a/gtk/gtkgesturelongpress.c
+++ b/gtk/gtkgesturelongpress.c
@@ -262,6 +262,8 @@ gtk_gesture_long_press_class_init (GtkGestureLongPressClass *klass)
GtkGesture *
gtk_gesture_long_press_new (GtkWidget *widget)
{
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
return g_object_new (GTK_TYPE_GESTURE_LONG_PRESS,
"widget", widget,
NULL);
diff --git a/gtk/gtkgesturemultipress.c b/gtk/gtkgesturemultipress.c
index 3fbe20f..1f49976 100644
--- a/gtk/gtkgesturemultipress.c
+++ b/gtk/gtkgesturemultipress.c
@@ -384,6 +384,8 @@ gtk_gesture_multi_press_init (GtkGestureMultiPress *gesture)
GtkGesture *
gtk_gesture_multi_press_new (GtkWidget *widget)
{
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
return g_object_new (GTK_TYPE_GESTURE_MULTI_PRESS,
"widget", widget,
NULL);
diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c
index e42f641..5b1aa7c 100644
--- a/gtk/gtkgesturerotate.c
+++ b/gtk/gtkgesturerotate.c
@@ -188,6 +188,8 @@ gtk_gesture_rotate_class_init (GtkGestureRotateClass *klass)
GtkGesture *
gtk_gesture_rotate_new (GtkWidget *widget)
{
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
return g_object_new (GTK_TYPE_GESTURE_ROTATE,
"widget", widget,
NULL);
diff --git a/gtk/gtkgestureswipe.c b/gtk/gtkgestureswipe.c
index 211789d..0ca5bb3 100644
--- a/gtk/gtkgestureswipe.c
+++ b/gtk/gtkgestureswipe.c
@@ -237,6 +237,8 @@ gtk_gesture_swipe_init (GtkGestureSwipe *gesture)
GtkGesture *
gtk_gesture_swipe_new (GtkWidget *widget)
{
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
return g_object_new (GTK_TYPE_GESTURE_SWIPE,
"widget", widget,
NULL);
diff --git a/gtk/gtkgesturezoom.c b/gtk/gtkgesturezoom.c
index a80ebd1..02e5a08 100644
--- a/gtk/gtkgesturezoom.c
+++ b/gtk/gtkgesturezoom.c
@@ -181,6 +181,8 @@ gtk_gesture_zoom_class_init (GtkGestureZoomClass *klass)
GtkGesture *
gtk_gesture_zoom_new (GtkWidget *widget)
{
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
return g_object_new (GTK_TYPE_GESTURE_ZOOM,
"widget", widget,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]