From 8cf5c5959f4b199129147d72483038ab4732f131 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 27 Aug 2012 02:20:00 +0100 Subject: [PATCH] rotate-action: fix wrong marshaller usage https://bugzilla.gnome.org/show_bug.cgi?id=682754 --- clutter/clutter-marshal.list | 2 +- clutter/clutter-rotate-action.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list index e97e5a5d7..681b4e746 100644 --- a/clutter/clutter-marshal.list +++ b/clutter/clutter-marshal.list @@ -1,6 +1,7 @@ BOOLEAN:BOXED BOOLEAN:BOXED,INT,INT BOOLEAN:OBJECT,BOXED,DOUBLE +BOOLEAN:OBJECT,DOUBLE BOOLEAN:OBJECT,ENUM BOOLEAN:STRING,UINT,FLAGS BOOLEAN:OBJECT @@ -17,7 +18,6 @@ VOID:INT,INT VOID:FLOAT,FLOAT VOID:INT,INT,INT,INT VOID:OBJECT -VOID:OBJECT,DOUBLE VOID:OBJECT,FLAGS VOID:OBJECT,FLOAT,FLOAT VOID:OBJECT,FLOAT,FLOAT,FLAGS diff --git a/clutter/clutter-rotate-action.c b/clutter/clutter-rotate-action.c index f3c4857e6..a5fdefbd0 100644 --- a/clutter/clutter-rotate-action.c +++ b/clutter/clutter-rotate-action.c @@ -208,7 +208,7 @@ clutter_rotate_action_class_init (ClutterRotateActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterRotateActionClass, rotate), _clutter_boolean_continue_accumulator, NULL, - _clutter_marshal_VOID__OBJECT_DOUBLE, + _clutter_marshal_BOOLEAN__OBJECT_DOUBLE, G_TYPE_BOOLEAN, 2, CLUTTER_TYPE_ACTOR, G_TYPE_DOUBLE);