diff options
| author | Neil Roberts <neil@linux.intel.com> | 2010-10-25 13:48:54 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2010-10-25 13:48:54 +0100 |
| commit | 844d4ede65b9fc6e68a4f8a453bc02729f405012 (patch) | |
| tree | bb165e932b902ddeb748453ff17fa1ba1604681f | |
| parent | ede5c449c8915db9ccc8cf6696c348a992df67cf (diff) | |
| download | clutter-844d4ede65b9fc6e68a4f8a453bc02729f405012.tar.gz | |
binding-pool: Use the correct marshaller
(cherry picked from commit 276acf5854c0e589eae9a76c78ef1faa50c46caa)
Conflicts:
clutter/clutter-marshal.list
| -rw-r--r-- | clutter/clutter-binding-pool.c | 8 | ||||
| -rw-r--r-- | clutter/clutter-marshal.list | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clutter/clutter-binding-pool.c b/clutter/clutter-binding-pool.c index b68e7568a..70977c203 100644 --- a/clutter/clutter-binding-pool.c +++ b/clutter/clutter-binding-pool.c @@ -508,7 +508,7 @@ clutter_binding_pool_install_action (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS; g_closure_set_marshal (closure, marshal); } @@ -574,7 +574,7 @@ clutter_binding_pool_install_closure (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS; g_closure_set_marshal (closure, marshal); } @@ -642,7 +642,7 @@ clutter_binding_pool_override_action (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS; g_closure_set_marshal (closure, marshal); } } @@ -702,7 +702,7 @@ clutter_binding_pool_override_closure (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS; g_closure_set_marshal (closure, marshal); } } diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list index 91c4c4f75..d23c88788 100644 --- a/clutter/clutter-marshal.list +++ b/clutter/clutter-marshal.list @@ -1,5 +1,5 @@ BOOLEAN:BOXED -BOOLEAN:STRING,UINT,ENUM +BOOLEAN:STRING,UINT,FLAGS DOUBLE:VOID UINT:VOID VOID:BOXED |