diff --git a/ChangeLog b/ChangeLog index 59828619c..9cd970917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-04 Emmanuele Bassi + + * clutter/clutter-actor.[ch]: Use the right get_type() function + name for ClutterVertex, and add the CLUTTER_TYPE_VERTEX macro. + 2007-07-03 Ross Burton * configure.ac: diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index bf08fd1fc..39e1dca74 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -2535,10 +2535,9 @@ clutter_geometry_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ( - g_intern_static_string ("ClutterGeometry"), - (GBoxedCopyFunc) clutter_geometry_copy, - (GBoxedFreeFunc) g_free); + our_type = g_boxed_type_register_static (g_intern_static_string ("ClutterGeometry"), + (GBoxedCopyFunc) clutter_geometry_copy, + (GBoxedFreeFunc) g_free); return our_type; } @@ -2547,7 +2546,7 @@ clutter_geometry_get_type (void) * ClutterVertices */ -static ClutterVertex* +static ClutterVertex * clutter_vertex_copy (const ClutterVertex *vertex) { ClutterVertex *result = g_new (ClutterVertex, 1); @@ -2563,10 +2562,9 @@ clutter_vertex_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ( - g_intern_static_string ("ClutterVertex"), - (GBoxedCopyFunc) clutter_vertex_copy, - (GBoxedFreeFunc) g_free); + our_type = g_boxed_type_register_static (g_intern_static_string ("ClutterVertex"), + (GBoxedCopyFunc) clutter_vertex_copy, + (GBoxedFreeFunc) g_free); return our_type; } @@ -2590,10 +2588,9 @@ clutter_actor_box_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ( - g_intern_static_string ("ClutterActorBox"), - (GBoxedCopyFunc) clutter_actor_box_copy, - (GBoxedFreeFunc) g_free); + our_type = g_boxed_type_register_static (g_intern_static_string ("ClutterActorBox"), + (GBoxedCopyFunc) clutter_actor_box_copy, + (GBoxedFreeFunc) g_free); return our_type; } diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h index f35d67082..2ea27aaa8 100644 --- a/clutter/clutter-actor.h +++ b/clutter/clutter-actor.h @@ -35,10 +35,11 @@ G_BEGIN_DECLS -#define CLUTTER_TYPE_GEOMETRY (clutter_geometry_get_type ()) -#define CLUTTER_TYPE_ACTOR_BOX (clutter_actor_box_get_type ()) +#define CLUTTER_TYPE_GEOMETRY (clutter_geometry_get_type ()) +#define CLUTTER_TYPE_ACTOR_BOX (clutter_actor_box_get_type ()) +#define CLUTTER_TYPE_VERTEX (clutter_vertex_get_type ()) -#define CLUTTER_TYPE_ACTOR clutter_actor_get_type() +#define CLUTTER_TYPE_ACTOR (clutter_actor_get_type ()) #define CLUTTER_ACTOR(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ACTOR, ClutterActor)) @@ -154,7 +155,7 @@ struct _ClutterVertex ClutterUnit z; }; -GType clutter_vertices_get_type (void) G_GNUC_CONST; +GType clutter_vertex_get_type (void) G_GNUC_CONST; /** * ClutterActor: