isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-28 05:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide the marshallers

Browse Source 
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.
This commit is contained in:
Emmanuele Bassi 2010-06-11 15:49:46 +01:00
parent ded9322a7a
commit b2c905ff50
23 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/Makefile.am
View File

@ -140,7 +140,7 @@ source_h = \
# glib-genmarshal rules # glib-genmarshal rules
glib_marshal_list = clutter-marshal.list glib_marshal_list = clutter-marshal.list
glib_marshal_prefix = clutter_marshal glib_marshal_prefix = _clutter_marshal
include $(top_srcdir)/build/autotools/Makefile.am.marshal include $(top_srcdir)/build/autotools/Makefile.am.marshal
# glib-mkenums rules # glib-mkenums rules

46
clutter/clutter-actor.c
View File

@ -4290,7 +4290,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
G_STRUCT_OFFSET (ClutterActorClass, destroy), G_STRUCT_OFFSET (ClutterActorClass, destroy),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterActor::show: * ClutterActor::show:
@ -4307,7 +4307,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterActorClass, show), G_STRUCT_OFFSET (ClutterActorClass, show),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterActor::hide: * ClutterActor::hide:
@ -4324,7 +4324,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterActorClass, hide), G_STRUCT_OFFSET (ClutterActorClass, hide),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterActor::parent-set: * ClutterActor::parent-set:
@ -4341,7 +4341,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, parent_set), G_STRUCT_OFFSET (ClutterActorClass, parent_set),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);
@ -4401,7 +4401,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, queue_redraw), G_STRUCT_OFFSET (ClutterActorClass, queue_redraw),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);
@ -4428,7 +4428,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, queue_relayout), G_STRUCT_OFFSET (ClutterActorClass, queue_relayout),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -4452,7 +4452,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, event), G_STRUCT_OFFSET (ClutterActorClass, event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
/** /**
@ -4474,7 +4474,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, button_press_event), G_STRUCT_OFFSET (ClutterActorClass, button_press_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
/** /**
@ -4496,7 +4496,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, button_release_event), G_STRUCT_OFFSET (ClutterActorClass, button_release_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
/** /**
@ -4518,7 +4518,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, scroll_event), G_STRUCT_OFFSET (ClutterActorClass, scroll_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
/** /**
@ -4540,7 +4540,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, key_press_event), G_STRUCT_OFFSET (ClutterActorClass, key_press_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
/** /**
@ -4563,7 +4563,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, key_release_event), G_STRUCT_OFFSET (ClutterActorClass, key_release_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
/** /**
@ -4585,7 +4585,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, motion_event), G_STRUCT_OFFSET (ClutterActorClass, motion_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
@ -4603,7 +4603,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, key_focus_in), G_STRUCT_OFFSET (ClutterActorClass, key_focus_in),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -4620,7 +4620,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, key_focus_out), G_STRUCT_OFFSET (ClutterActorClass, key_focus_out),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -4641,7 +4641,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, enter_event), G_STRUCT_OFFSET (ClutterActorClass, enter_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
@ -4663,7 +4663,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, leave_event), G_STRUCT_OFFSET (ClutterActorClass, leave_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
@ -4691,7 +4691,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, captured_event), G_STRUCT_OFFSET (ClutterActorClass, captured_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
@ -4715,7 +4715,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, paint), G_STRUCT_OFFSET (ClutterActorClass, paint),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterActor::realize: * ClutterActor::realize:
@ -4732,7 +4732,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, realize), G_STRUCT_OFFSET (ClutterActorClass, realize),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterActor::unrealize: * ClutterActor::unrealize:
@ -4749,7 +4749,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, unrealize), G_STRUCT_OFFSET (ClutterActorClass, unrealize),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -4800,7 +4800,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterActorClass, pick), G_STRUCT_OFFSET (ClutterActorClass, pick),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__BOXED, _clutter_marshal_VOID__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_COLOR | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_COLOR | G_SIGNAL_TYPE_STATIC_SCOPE);
@ -4825,7 +4825,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, 0,
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__BOXED_FLAGS, _clutter_marshal_VOID__BOXED_FLAGS,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
CLUTTER_TYPE_ACTOR_BOX, CLUTTER_TYPE_ACTOR_BOX,
CLUTTER_TYPE_ALLOCATION_FLAGS); CLUTTER_TYPE_ALLOCATION_FLAGS);

2
clutter/clutter-alpha.c
View File

@ -459,7 +459,7 @@ clutter_alpha_set_closure_internal (ClutterAlpha *alpha,
/* set the marshaller */ /* set the marshaller */
if (G_CLOSURE_NEEDS_MARSHAL (closure)) if (G_CLOSURE_NEEDS_MARSHAL (closure))
{ {
GClosureMarshal marshal = clutter_marshal_DOUBLE__VOID; GClosureMarshal marshal = _clutter_marshal_DOUBLE__VOID;
g_closure_set_marshal (closure, marshal); g_closure_set_marshal (closure, marshal);
} }

5
clutter/clutter-animation.c
View File

@ -145,6 +145,7 @@
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#include "clutter-interval.h" #include "clutter-interval.h"
#include "clutter-marshal.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-scriptable.h" #include "clutter-scriptable.h"
#include "clutter-script-private.h" #include "clutter-script-private.h"
@ -551,7 +552,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterAnimationClass, started), G_STRUCT_OFFSET (ClutterAnimationClass, started),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -572,7 +573,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterAnimationClass, completed), G_STRUCT_OFFSET (ClutterAnimationClass, completed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }

4
clutter/clutter-backend.c
View File

@ -199,7 +199,7 @@ clutter_backend_class_init (ClutterBackendClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterBackendClass, resolution_changed), G_STRUCT_OFFSET (ClutterBackendClass, resolution_changed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
backend_signals[FONT_CHANGED] = backend_signals[FONT_CHANGED] =
@ -208,7 +208,7 @@ clutter_backend_class_init (ClutterBackendClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterBackendClass, font_changed), G_STRUCT_OFFSET (ClutterBackendClass, font_changed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
klass->resolution_changed = clutter_backend_real_resolution_changed; klass->resolution_changed = clutter_backend_real_resolution_changed;

2
clutter/clutter-behaviour-path.c
View File

@ -233,7 +233,7 @@ clutter_behaviour_path_class_init (ClutterBehaviourPathClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterBehaviourPathClass, knot_reached), G_STRUCT_OFFSET (ClutterBehaviourPathClass, knot_reached),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__UINT, _clutter_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_UINT); G_TYPE_UINT);

5
clutter/clutter-behaviour.c
View File

@ -325,7 +325,7 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterBehaviourClass, applied), G_STRUCT_OFFSET (ClutterBehaviourClass, applied),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); 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 * The ::removed signal is emitted each time a behaviour is not applied
* to an actor anymore. * to an actor anymore.
* *
* Since: 0.4
*/ */
behave_signals[REMOVED] = behave_signals[REMOVED] =
g_signal_new ("removed", g_signal_new ("removed",
@ -343,7 +344,7 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterBehaviourClass, removed), G_STRUCT_OFFSET (ClutterBehaviourClass, removed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);

8
clutter/clutter-binding-pool.c
View File

@ -502,7 +502,7 @@ clutter_binding_pool_install_action (ClutterBindingPool *pool,
{ {
GClosureMarshal marshal; GClosureMarshal marshal;
marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM;
g_closure_set_marshal (closure, marshal); g_closure_set_marshal (closure, marshal);
} }
@ -568,7 +568,7 @@ clutter_binding_pool_install_closure (ClutterBindingPool *pool,
{ {
GClosureMarshal marshal; GClosureMarshal marshal;
marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM;
g_closure_set_marshal (closure, marshal); g_closure_set_marshal (closure, marshal);
} }
@ -636,7 +636,7 @@ clutter_binding_pool_override_action (ClutterBindingPool *pool,
{ {
GClosureMarshal marshal; GClosureMarshal marshal;
marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM;
g_closure_set_marshal (closure, marshal); g_closure_set_marshal (closure, marshal);
} }
} }
@ -696,7 +696,7 @@ clutter_binding_pool_override_closure (ClutterBindingPool *pool,
{ {
GClosureMarshal marshal; GClosureMarshal marshal;
marshal = clutter_marshal_BOOLEAN__STRING_UINT_ENUM; marshal = _clutter_marshal_BOOLEAN__STRING_UINT_ENUM;
g_closure_set_marshal (closure, marshal); g_closure_set_marshal (closure, marshal);
} }
} }

2
clutter/clutter-click-action.c
View File

@ -271,7 +271,7 @@ clutter_click_action_class_init (ClutterClickActionClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterClickActionClass, clicked), G_STRUCT_OFFSET (ClutterClickActionClass, clicked),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);
} }

6
clutter/clutter-container.c
View File

@ -124,7 +124,7 @@ clutter_container_base_init (gpointer g_iface)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterContainerIface, actor_added), G_STRUCT_OFFSET (ClutterContainerIface, actor_added),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);
/** /**
@ -143,7 +143,7 @@ clutter_container_base_init (gpointer g_iface)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterContainerIface, actor_removed), G_STRUCT_OFFSET (ClutterContainerIface, actor_removed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);
@ -164,7 +164,7 @@ clutter_container_base_init (gpointer g_iface)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterContainerIface, child_notify), G_STRUCT_OFFSET (ClutterContainerIface, child_notify),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT_OBJECT_PARAM, _clutter_marshal_VOID__OBJECT_OBJECT_PARAM,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
CLUTTER_TYPE_ACTOR, G_TYPE_PARAM); CLUTTER_TYPE_ACTOR, G_TYPE_PARAM);

4
clutter/clutter-device-manager.c
View File

@ -148,7 +148,7 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, 0,
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_INPUT_DEVICE); CLUTTER_TYPE_INPUT_DEVICE);
@ -168,7 +168,7 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, 0,
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_INPUT_DEVICE); CLUTTER_TYPE_INPUT_DEVICE);
} }

6
clutter/clutter-drag-action.c
View File

@ -529,7 +529,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterDragActionClass, drag_begin), G_STRUCT_OFFSET (ClutterDragActionClass, drag_begin),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS,
G_TYPE_NONE, 5, G_TYPE_NONE, 5,
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_TYPE_FLOAT, G_TYPE_FLOAT,
@ -572,7 +572,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterDragActionClass, drag_motion), G_STRUCT_OFFSET (ClutterDragActionClass, drag_motion),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT_FLOAT_FLOAT, _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT,
G_TYPE_NONE, 3, G_TYPE_NONE, 3,
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_TYPE_FLOAT, G_TYPE_FLOAT,
@ -601,7 +601,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterDragActionClass, drag_end), G_STRUCT_OFFSET (ClutterDragActionClass, drag_end),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS,
G_TYPE_NONE, 5, G_TYPE_NONE, 5,
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
G_TYPE_FLOAT, G_TYPE_FLOAT,

2
clutter/clutter-layout-manager.c
View File

@ -538,7 +538,7 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass)
G_STRUCT_OFFSET (ClutterLayoutManagerClass, G_STRUCT_OFFSET (ClutterLayoutManagerClass,
layout_changed), layout_changed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }

8
clutter/clutter-media.c
View File

@ -40,9 +40,11 @@
#include "config.h" #include "config.h"
#endif #endif
#include "clutter-debug.h"
#include "clutter-enum-types.h"
#include "clutter-marshal.h"
#include "clutter-media.h" #include "clutter-media.h"
#include "clutter-main.h" #include "clutter-main.h"
#include "clutter-enum-types.h"
#include "clutter-private.h" /* for DBG */ #include "clutter-private.h" /* for DBG */
enum enum
@ -211,7 +213,7 @@ clutter_media_base_init (gpointer g_iface)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterMediaIface, eos), G_STRUCT_OFFSET (ClutterMediaIface, eos),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterMedia::error: * ClutterMedia::error:
@ -228,7 +230,7 @@ clutter_media_base_init (gpointer g_iface)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterMediaIface, error), G_STRUCT_OFFSET (ClutterMediaIface, error),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__POINTER, _clutter_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
} }

10
clutter/clutter-model.c
View File

@ -349,7 +349,7 @@ clutter_model_class_init (ClutterModelClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterModelClass, row_added), G_STRUCT_OFFSET (ClutterModelClass, row_added),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_MODEL_ITER); CLUTTER_TYPE_MODEL_ITER);
/** /**
@ -369,7 +369,7 @@ clutter_model_class_init (ClutterModelClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterModelClass, row_removed), G_STRUCT_OFFSET (ClutterModelClass, row_removed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_MODEL_ITER); CLUTTER_TYPE_MODEL_ITER);
/** /**
@ -389,7 +389,7 @@ clutter_model_class_init (ClutterModelClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterModelClass, row_changed), G_STRUCT_OFFSET (ClutterModelClass, row_changed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_MODEL_ITER); CLUTTER_TYPE_MODEL_ITER);
/** /**
@ -406,7 +406,7 @@ clutter_model_class_init (ClutterModelClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterModelClass, sort_changed), G_STRUCT_OFFSET (ClutterModelClass, sort_changed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterModel::filter-changed: * ClutterModel::filter-changed:
@ -422,7 +422,7 @@ clutter_model_class_init (ClutterModelClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterModelClass, filter_changed), G_STRUCT_OFFSET (ClutterModelClass, filter_changed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }

10
clutter/clutter-score.c
View File

@ -241,7 +241,7 @@ clutter_score_class_init (ClutterScoreClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterScoreClass, timeline_started), G_STRUCT_OFFSET (ClutterScoreClass, timeline_started),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, G_TYPE_NONE,
1, CLUTTER_TYPE_TIMELINE); 1, CLUTTER_TYPE_TIMELINE);
/** /**
@ -260,7 +260,7 @@ clutter_score_class_init (ClutterScoreClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterScoreClass, timeline_completed), G_STRUCT_OFFSET (ClutterScoreClass, timeline_completed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_TIMELINE); CLUTTER_TYPE_TIMELINE);
/** /**
@ -277,7 +277,7 @@ clutter_score_class_init (ClutterScoreClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterScoreClass, completed), G_STRUCT_OFFSET (ClutterScoreClass, completed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterScore::started: * ClutterScore::started:
@ -293,7 +293,7 @@ clutter_score_class_init (ClutterScoreClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterScoreClass, started), G_STRUCT_OFFSET (ClutterScoreClass, started),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterScore::paused: * ClutterScore::paused:
@ -310,7 +310,7 @@ clutter_score_class_init (ClutterScoreClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterScoreClass, paused), G_STRUCT_OFFSET (ClutterScoreClass, paused),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }

4
clutter/clutter-stage-manager.c
View File

@ -145,7 +145,7 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageManagerClass, stage_added), G_STRUCT_OFFSET (ClutterStageManagerClass, stage_added),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE); CLUTTER_TYPE_STAGE);
/** /**
@ -164,7 +164,7 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageManagerClass, stage_removed), G_STRUCT_OFFSET (ClutterStageManagerClass, stage_removed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, _clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_STAGE); CLUTTER_TYPE_STAGE);
} }

10
clutter/clutter-stage.c
View File

@ -1152,7 +1152,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterStageClass, fullscreen), G_STRUCT_OFFSET (ClutterStageClass, fullscreen),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterStage::unfullscreen * ClutterStage::unfullscreen
@ -1169,7 +1169,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageClass, unfullscreen), G_STRUCT_OFFSET (ClutterStageClass, unfullscreen),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterStage::activate * ClutterStage::activate
@ -1186,7 +1186,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageClass, activate), G_STRUCT_OFFSET (ClutterStageClass, activate),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterStage::deactivate * ClutterStage::deactivate
@ -1203,7 +1203,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageClass, deactivate), G_STRUCT_OFFSET (ClutterStageClass, deactivate),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -1233,7 +1233,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStageClass, delete_event), G_STRUCT_OFFSET (ClutterStageClass, delete_event),
_clutter_boolean_handled_accumulator, NULL, _clutter_boolean_handled_accumulator, NULL,
clutter_marshal_BOOLEAN__BOXED, _clutter_marshal_BOOLEAN__BOXED,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);

2
clutter/clutter-state.c
View File

@ -1110,7 +1110,7 @@ clutter_state_class_init (ClutterStateClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterStateClass, completed), G_STRUCT_OFFSET (ClutterStateClass, completed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**

10
clutter/clutter-text.c
View File

@ -2818,7 +2818,7 @@ clutter_text_class_init (ClutterTextClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTextClass, text_changed), G_STRUCT_OFFSET (ClutterTextClass, text_changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
@ -2843,7 +2843,7 @@ clutter_text_class_init (ClutterTextClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0, 0,
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__STRING_INT_POINTER, _clutter_marshal_VOID__STRING_INT_POINTER,
G_TYPE_NONE, 3, G_TYPE_NONE, 3,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_INT, G_TYPE_INT,
@ -2866,7 +2866,7 @@ clutter_text_class_init (ClutterTextClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0, 0,
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__INT_INT, _clutter_marshal_VOID__INT_INT,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_INT, G_TYPE_INT,
G_TYPE_INT); G_TYPE_INT);
@ -2889,7 +2889,7 @@ clutter_text_class_init (ClutterTextClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTextClass, cursor_event), G_STRUCT_OFFSET (ClutterTextClass, cursor_event),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__BOXED, _clutter_marshal_VOID__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_GEOMETRY | G_SIGNAL_TYPE_STATIC_SCOPE); CLUTTER_TYPE_GEOMETRY | G_SIGNAL_TYPE_STATIC_SCOPE);
@ -2909,7 +2909,7 @@ clutter_text_class_init (ClutterTextClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTextClass, activate), G_STRUCT_OFFSET (ClutterTextClass, activate),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
binding_pool = clutter_binding_pool_get_for_class (klass); binding_pool = clutter_binding_pool_get_for_class (klass);

6
clutter/clutter-texture.c
View File

@ -1115,7 +1115,7 @@ clutter_texture_class_init (ClutterTextureClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTextureClass, size_change), G_STRUCT_OFFSET (ClutterTextureClass, size_change),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__INT_INT, _clutter_marshal_VOID__INT_INT,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_INT, G_TYPE_INT,
G_TYPE_INT); G_TYPE_INT);
@ -1132,7 +1132,7 @@ clutter_texture_class_init (ClutterTextureClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTextureClass, pixbuf_change), G_STRUCT_OFFSET (ClutterTextureClass, pixbuf_change),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, G_TYPE_NONE,
0); 0);
/** /**
@ -1152,7 +1152,7 @@ clutter_texture_class_init (ClutterTextureClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTextureClass, load_finished), G_STRUCT_OFFSET (ClutterTextureClass, load_finished),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__POINTER, _clutter_marshal_VOID__POINTER,
G_TYPE_NONE, G_TYPE_NONE,
1, 1,
G_TYPE_POINTER); G_TYPE_POINTER);

10
clutter/clutter-timeline.c
View File

@ -324,7 +324,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTimelineClass, new_frame), G_STRUCT_OFFSET (ClutterTimelineClass, new_frame),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__INT, _clutter_marshal_VOID__INT,
G_TYPE_NONE, G_TYPE_NONE,
1, G_TYPE_INT); 1, G_TYPE_INT);
/** /**
@ -340,7 +340,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTimelineClass, completed), G_STRUCT_OFFSET (ClutterTimelineClass, completed),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterTimeline::started: * ClutterTimeline::started:
@ -357,7 +357,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTimelineClass, started), G_STRUCT_OFFSET (ClutterTimelineClass, started),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterTimeline::paused: * ClutterTimeline::paused:
@ -371,7 +371,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterTimelineClass, paused), G_STRUCT_OFFSET (ClutterTimelineClass, paused),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__VOID, _clutter_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
/** /**
* ClutterTimeline::marker-reached: * ClutterTimeline::marker-reached:
@ -411,7 +411,7 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS, G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS,
G_STRUCT_OFFSET (ClutterTimelineClass, marker_reached), G_STRUCT_OFFSET (ClutterTimelineClass, marker_reached),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__STRING_INT, _clutter_marshal_VOID__STRING_INT,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_INT); G_TYPE_INT);

4
clutter/x11/clutter-x11-texture-pixmap.c
View File

@ -784,7 +784,7 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass)
G_STRUCT_OFFSET (ClutterX11TexturePixmapClass, \ G_STRUCT_OFFSET (ClutterX11TexturePixmapClass, \
update_area), update_area),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__INT_INT_INT_INT, _clutter_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4, G_TYPE_NONE, 4,
G_TYPE_INT, G_TYPE_INT,
G_TYPE_INT, G_TYPE_INT,
@ -818,7 +818,7 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
0, 0,
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__INT_INT_INT_INT, _clutter_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4, G_TYPE_NONE, 4,
G_TYPE_INT, G_TYPE_INT,
G_TYPE_INT, G_TYPE_INT,