From b2c905ff506b9be53e6c14c2d1bc909b97130e76 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 11 Jun 2010 15:49:46 +0100 Subject: [PATCH] Hide the marshallers The marshallers we use for the signals are declared in a private header, and it stands to reason that they should also be hidden in the shared object by using the common '_' prefix. We are also using some direct g_cclosure_marshal_* symbol from GLib, instead of consistently use the clutter_marshal_* symbol. --- clutter/Makefile.am | 2 +- clutter/clutter-actor.c | 46 ++++++++++++++++---------------- clutter/clutter-alpha.c | 2 +- clutter/clutter-animation.c | 5 ++-- clutter/clutter-backend.c | 4 +-- clutter/clutter-behaviour-path.c | 2 +- clutter/clutter-behaviour.c | 5 ++-- clutter/clutter-binding-pool.c | 8 +++--- clutter/clutter-click-action.c | 2 +- clutter/clutter-container.c | 6 ++--- clutter/clutter-device-manager.c | 4 +-- clutter/clutter-drag-action.c | 6 ++--- clutter/clutter-layout-manager.c | 2 +- clutter/clutter-media.c | 8 +++--- clutter/clutter-model.c | 10 +++---- clutter/clutter-score.c | 10 +++---- clutter/clutter-stage-manager.c | 4 +-- clutter/clutter-stage.c | 10 +++---- clutter/clutter-state.c | 2 +- clutter/clutter-text.c | 10 +++---- clutter/clutter-texture.c | 6 ++--- clutter/clutter-timeline.c | 10 +++---- clutter/x11/clutter-x11-texture-pixmap.c | 4 +-- 23 files changed, 86 insertions(+), 82 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index c514406..5607803 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -140,7 +140,7 @@ source_h = \ # glib-genmarshal rules glib_marshal_list = clutter-marshal.list -glib_marshal_prefix = clutter_marshal +glib_marshal_prefix = _clutter_marshal include $(top_srcdir)/build/autotools/Makefile.am.marshal # glib-mkenums rules diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 797c7cd..e3a629c 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -4290,7 +4290,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (ClutterActorClass, destroy), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterActor::show: @@ -4307,7 +4307,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterActorClass, show), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterActor::hide: @@ -4324,7 +4324,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterActorClass, hide), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterActor::parent-set: @@ -4341,7 +4341,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, parent_set), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); @@ -4401,7 +4401,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, queue_redraw), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); @@ -4428,7 +4428,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, queue_relayout), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -4452,7 +4452,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); /** @@ -4474,7 +4474,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, button_press_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); /** @@ -4496,7 +4496,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, button_release_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); /** @@ -4518,7 +4518,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, scroll_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); /** @@ -4540,7 +4540,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, key_press_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); /** @@ -4563,7 +4563,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, key_release_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); /** @@ -4585,7 +4585,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, motion_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -4603,7 +4603,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, key_focus_in), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -4620,7 +4620,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, key_focus_out), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -4641,7 +4641,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, enter_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -4663,7 +4663,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, leave_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -4691,7 +4691,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, captured_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -4715,7 +4715,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, paint), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterActor::realize: @@ -4732,7 +4732,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, realize), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterActor::unrealize: @@ -4749,7 +4749,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, unrealize), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -4800,7 +4800,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterActorClass, pick), NULL, NULL, - clutter_marshal_VOID__BOXED, + _clutter_marshal_VOID__BOXED, G_TYPE_NONE, 1, CLUTTER_TYPE_COLOR | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -4825,7 +4825,7 @@ clutter_actor_class_init (ClutterActorClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - clutter_marshal_VOID__BOXED_FLAGS, + _clutter_marshal_VOID__BOXED_FLAGS, G_TYPE_NONE, 2, CLUTTER_TYPE_ACTOR_BOX, CLUTTER_TYPE_ALLOCATION_FLAGS); diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c index 24ed351..a3d381e 100644 --- a/clutter/clutter-alpha.c +++ b/clutter/clutter-alpha.c @@ -459,7 +459,7 @@ clutter_alpha_set_closure_internal (ClutterAlpha *alpha, /* set the marshaller */ if (G_CLOSURE_NEEDS_MARSHAL (closure)) { - GClosureMarshal marshal = clutter_marshal_DOUBLE__VOID; + GClosureMarshal marshal = _clutter_marshal_DOUBLE__VOID; g_closure_set_marshal (closure, marshal); } diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c index dd9599a..41b02de 100644 --- a/clutter/clutter-animation.c +++ b/clutter/clutter-animation.c @@ -145,6 +145,7 @@ #include "clutter-debug.h" #include "clutter-enum-types.h" #include "clutter-interval.h" +#include "clutter-marshal.h" #include "clutter-private.h" #include "clutter-scriptable.h" #include "clutter-script-private.h" @@ -551,7 +552,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterAnimationClass, started), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -572,7 +573,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterAnimationClass, completed), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); } diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index e501336..d6fbb78 100644 --- a/clutter/clutter-backend.c +++ b/clutter/clutter-backend.c @@ -199,7 +199,7 @@ clutter_backend_class_init (ClutterBackendClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterBackendClass, resolution_changed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); backend_signals[FONT_CHANGED] = @@ -208,7 +208,7 @@ clutter_backend_class_init (ClutterBackendClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterBackendClass, font_changed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); klass->resolution_changed = clutter_backend_real_resolution_changed; diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c index a595abb..48e614c 100644 --- a/clutter/clutter-behaviour-path.c +++ b/clutter/clutter-behaviour-path.c @@ -233,7 +233,7 @@ clutter_behaviour_path_class_init (ClutterBehaviourPathClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterBehaviourPathClass, knot_reached), NULL, NULL, - clutter_marshal_VOID__UINT, + _clutter_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); diff --git a/clutter/clutter-behaviour.c b/clutter/clutter-behaviour.c index 49b1249..49f7306 100644 --- a/clutter/clutter-behaviour.c +++ b/clutter/clutter-behaviour.c @@ -325,7 +325,7 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterBehaviourClass, applied), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); /** @@ -336,6 +336,7 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) * The ::removed signal is emitted each time a behaviour is not applied * to an actor anymore. * + * Since: 0.4 */ behave_signals[REMOVED] = g_signal_new ("removed", @@ -343,7 +344,7 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterBehaviourClass, removed), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); diff --git a/clutter/clutter-binding-pool.c b/clutter/clutter-binding-pool.c index df4b60b..8a3c31c 100644 --- a/clutter/clutter-binding-pool.c +++ b/clutter/clutter-binding-pool.c @@ -502,7 +502,7 @@ clutter_binding_pool_install_action (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; g_closure_set_marshal (closure, marshal); } @@ -568,7 +568,7 @@ clutter_binding_pool_install_closure (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; g_closure_set_marshal (closure, marshal); } @@ -636,7 +636,7 @@ clutter_binding_pool_override_action (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; g_closure_set_marshal (closure, marshal); } } @@ -696,7 +696,7 @@ clutter_binding_pool_override_closure (ClutterBindingPool *pool, { GClosureMarshal marshal; - marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; + marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM; g_closure_set_marshal (closure, marshal); } } diff --git a/clutter/clutter-click-action.c b/clutter/clutter-click-action.c index 222e3ba..9dabb7c 100644 --- a/clutter/clutter-click-action.c +++ b/clutter/clutter-click-action.c @@ -271,7 +271,7 @@ clutter_click_action_class_init (ClutterClickActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterClickActionClass, clicked), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); } diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c index de14484..c47526b 100644 --- a/clutter/clutter-container.c +++ b/clutter/clutter-container.c @@ -124,7 +124,7 @@ clutter_container_base_init (gpointer g_iface) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterContainerIface, actor_added), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); /** @@ -143,7 +143,7 @@ clutter_container_base_init (gpointer g_iface) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterContainerIface, actor_removed), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_ACTOR); @@ -164,7 +164,7 @@ clutter_container_base_init (gpointer g_iface) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterContainerIface, child_notify), NULL, NULL, - clutter_marshal_VOID__OBJECT_OBJECT_PARAM, + _clutter_marshal_VOID__OBJECT_OBJECT_PARAM, G_TYPE_NONE, 2, CLUTTER_TYPE_ACTOR, G_TYPE_PARAM); diff --git a/clutter/clutter-device-manager.c b/clutter/clutter-device-manager.c index d52897a..e86a4b3 100644 --- a/clutter/clutter-device-manager.c +++ b/clutter/clutter-device-manager.c @@ -148,7 +148,7 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_INPUT_DEVICE); @@ -168,7 +168,7 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_INPUT_DEVICE); } diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c index ddba5aa..90bb952 100644 --- a/clutter/clutter-drag-action.c +++ b/clutter/clutter-drag-action.c @@ -529,7 +529,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterDragActionClass, drag_begin), NULL, NULL, - clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, + _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, G_TYPE_NONE, 5, CLUTTER_TYPE_ACTOR, G_TYPE_FLOAT, @@ -572,7 +572,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterDragActionClass, drag_motion), NULL, NULL, - clutter_marshal_VOID__OBJECT_FLOAT_FLOAT, + _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT, G_TYPE_NONE, 3, CLUTTER_TYPE_ACTOR, G_TYPE_FLOAT, @@ -601,7 +601,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterDragActionClass, drag_end), NULL, NULL, - clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, + _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, G_TYPE_NONE, 5, CLUTTER_TYPE_ACTOR, G_TYPE_FLOAT, diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter-layout-manager.c index 6a28929..870c25d 100644 --- a/clutter/clutter-layout-manager.c +++ b/clutter/clutter-layout-manager.c @@ -538,7 +538,7 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass) G_STRUCT_OFFSET (ClutterLayoutManagerClass, layout_changed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); } diff --git a/clutter/clutter-media.c b/clutter/clutter-media.c index ce50cf2..4a656cb 100644 --- a/clutter/clutter-media.c +++ b/clutter/clutter-media.c @@ -40,9 +40,11 @@ #include "config.h" #endif +#include "clutter-debug.h" +#include "clutter-enum-types.h" +#include "clutter-marshal.h" #include "clutter-media.h" #include "clutter-main.h" -#include "clutter-enum-types.h" #include "clutter-private.h" /* for DBG */ enum @@ -211,7 +213,7 @@ clutter_media_base_init (gpointer g_iface) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterMediaIface, eos), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterMedia::error: @@ -228,7 +230,7 @@ clutter_media_base_init (gpointer g_iface) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterMediaIface, error), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + _clutter_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); } diff --git a/clutter/clutter-model.c b/clutter/clutter-model.c index 5a982ea..2a68382 100644 --- a/clutter/clutter-model.c +++ b/clutter/clutter-model.c @@ -349,7 +349,7 @@ clutter_model_class_init (ClutterModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterModelClass, row_added), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_MODEL_ITER); /** @@ -369,7 +369,7 @@ clutter_model_class_init (ClutterModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterModelClass, row_removed), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_MODEL_ITER); /** @@ -389,7 +389,7 @@ clutter_model_class_init (ClutterModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterModelClass, row_changed), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_MODEL_ITER); /** @@ -406,7 +406,7 @@ clutter_model_class_init (ClutterModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterModelClass, sort_changed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterModel::filter-changed: @@ -422,7 +422,7 @@ clutter_model_class_init (ClutterModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterModelClass, filter_changed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); } diff --git a/clutter/clutter-score.c b/clutter/clutter-score.c index 6f16b77..f54f523 100644 --- a/clutter/clutter-score.c +++ b/clutter/clutter-score.c @@ -241,7 +241,7 @@ clutter_score_class_init (ClutterScoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterScoreClass, timeline_started), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_TIMELINE); /** @@ -260,7 +260,7 @@ clutter_score_class_init (ClutterScoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterScoreClass, timeline_completed), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_TIMELINE); /** @@ -277,7 +277,7 @@ clutter_score_class_init (ClutterScoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterScoreClass, completed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterScore::started: @@ -293,7 +293,7 @@ clutter_score_class_init (ClutterScoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterScoreClass, started), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterScore::paused: @@ -310,7 +310,7 @@ clutter_score_class_init (ClutterScoreClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterScoreClass, paused), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); } diff --git a/clutter/clutter-stage-manager.c b/clutter/clutter-stage-manager.c index 0a1fda6..6698e45 100644 --- a/clutter/clutter-stage-manager.c +++ b/clutter/clutter-stage-manager.c @@ -145,7 +145,7 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStageManagerClass, stage_added), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_STAGE); /** @@ -164,7 +164,7 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStageManagerClass, stage_removed), NULL, NULL, - clutter_marshal_VOID__OBJECT, + _clutter_marshal_VOID__OBJECT, G_TYPE_NONE, 1, CLUTTER_TYPE_STAGE); } diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index 03358f2..543d12b 100644 --- a/clutter/clutter-stage.c +++ b/clutter/clutter-stage.c @@ -1152,7 +1152,7 @@ clutter_stage_class_init (ClutterStageClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ClutterStageClass, fullscreen), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterStage::unfullscreen @@ -1169,7 +1169,7 @@ clutter_stage_class_init (ClutterStageClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStageClass, unfullscreen), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterStage::activate @@ -1186,7 +1186,7 @@ clutter_stage_class_init (ClutterStageClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStageClass, activate), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterStage::deactivate @@ -1203,7 +1203,7 @@ clutter_stage_class_init (ClutterStageClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStageClass, deactivate), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -1233,7 +1233,7 @@ clutter_stage_class_init (ClutterStageClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStageClass, delete_event), _clutter_boolean_handled_accumulator, NULL, - clutter_marshal_BOOLEAN__BOXED, + _clutter_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c index 6a8b91b..2821aef 100644 --- a/clutter/clutter-state.c +++ b/clutter/clutter-state.c @@ -1110,7 +1110,7 @@ clutter_state_class_init (ClutterStateClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterStateClass, completed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c index 756a0e2..ccdb727 100644 --- a/clutter/clutter-text.c +++ b/clutter/clutter-text.c @@ -2818,7 +2818,7 @@ clutter_text_class_init (ClutterTextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTextClass, text_changed), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -2843,7 +2843,7 @@ clutter_text_class_init (ClutterTextClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, - clutter_marshal_VOID__STRING_INT_POINTER, + _clutter_marshal_VOID__STRING_INT_POINTER, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, @@ -2866,7 +2866,7 @@ clutter_text_class_init (ClutterTextClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, - clutter_marshal_VOID__INT_INT, + _clutter_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); @@ -2889,7 +2889,7 @@ clutter_text_class_init (ClutterTextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTextClass, cursor_event), NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + _clutter_marshal_VOID__BOXED, G_TYPE_NONE, 1, CLUTTER_TYPE_GEOMETRY | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -2909,7 +2909,7 @@ clutter_text_class_init (ClutterTextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTextClass, activate), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); binding_pool = clutter_binding_pool_get_for_class (klass); diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 6f2c925..6553adc 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -1115,7 +1115,7 @@ clutter_texture_class_init (ClutterTextureClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTextureClass, size_change), NULL, NULL, - clutter_marshal_VOID__INT_INT, + _clutter_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); @@ -1132,7 +1132,7 @@ clutter_texture_class_init (ClutterTextureClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTextureClass, pixbuf_change), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -1152,7 +1152,7 @@ clutter_texture_class_init (ClutterTextureClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTextureClass, load_finished), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + _clutter_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index 58b68aa..beeb3e4 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -324,7 +324,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTimelineClass, new_frame), NULL, NULL, - clutter_marshal_VOID__INT, + _clutter_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); /** @@ -340,7 +340,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTimelineClass, completed), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterTimeline::started: @@ -357,7 +357,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTimelineClass, started), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterTimeline::paused: @@ -371,7 +371,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterTimelineClass, paused), NULL, NULL, - clutter_marshal_VOID__VOID, + _clutter_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * ClutterTimeline::marker-reached: @@ -411,7 +411,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (ClutterTimelineClass, marker_reached), NULL, NULL, - clutter_marshal_VOID__STRING_INT, + _clutter_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT); diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c index eef4cfc..78db62a 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/x11/clutter-x11-texture-pixmap.c @@ -784,7 +784,7 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass) G_STRUCT_OFFSET (ClutterX11TexturePixmapClass, \ update_area), NULL, NULL, - clutter_marshal_VOID__INT_INT_INT_INT, + _clutter_marshal_VOID__INT_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, @@ -818,7 +818,7 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - clutter_marshal_VOID__INT_INT_INT_INT, + _clutter_marshal_VOID__INT_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, -- 2.7.4