brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-07-04 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-actor.[ch]: Use the right get_type() function
	name for ClutterVertex, and add the CLUTTER_TYPE_VERTEX macro.
This commit is contained in:
Emmanuele Bassi 2007-07-04 09:17:10 +00:00
parent 52a3eb0263
commit 11775a16f0
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-04 Emmanuele Bassi <ebassi@openedhand.com>
* 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 <ross@openedhand.com> 2007-07-03 Ross Burton <ross@openedhand.com>
* configure.ac: * configure.ac:

11
clutter/clutter-actor.c
View File

@ -2535,8 +2535,7 @@ clutter_geometry_get_type (void)
static GType our_type = 0; static GType our_type = 0;
if (our_type == 0) if (our_type == 0)
our_type = g_boxed_type_register_static ( our_type = g_boxed_type_register_static (g_intern_static_string ("ClutterGeometry"),
g_intern_static_string ("ClutterGeometry"),
(GBoxedCopyFunc) clutter_geometry_copy, (GBoxedCopyFunc) clutter_geometry_copy,
(GBoxedFreeFunc) g_free); (GBoxedFreeFunc) g_free);
@ -2547,7 +2546,7 @@ clutter_geometry_get_type (void)
* ClutterVertices * ClutterVertices
*/ */
static ClutterVertex* static ClutterVertex *
clutter_vertex_copy (const ClutterVertex *vertex) clutter_vertex_copy (const ClutterVertex *vertex)
{ {
ClutterVertex *result = g_new (ClutterVertex, 1); ClutterVertex *result = g_new (ClutterVertex, 1);
@ -2563,8 +2562,7 @@ clutter_vertex_get_type (void)
static GType our_type = 0; static GType our_type = 0;
if (our_type == 0) if (our_type == 0)
our_type = g_boxed_type_register_static ( our_type = g_boxed_type_register_static (g_intern_static_string ("ClutterVertex"),
g_intern_static_string ("ClutterVertex"),
(GBoxedCopyFunc) clutter_vertex_copy, (GBoxedCopyFunc) clutter_vertex_copy,
(GBoxedFreeFunc) g_free); (GBoxedFreeFunc) g_free);
@ -2590,8 +2588,7 @@ clutter_actor_box_get_type (void)
static GType our_type = 0; static GType our_type = 0;
if (our_type == 0) if (our_type == 0)
our_type = g_boxed_type_register_static ( our_type = g_boxed_type_register_static (g_intern_static_string ("ClutterActorBox"),
g_intern_static_string ("ClutterActorBox"),
(GBoxedCopyFunc) clutter_actor_box_copy, (GBoxedCopyFunc) clutter_actor_box_copy,
(GBoxedFreeFunc) g_free); (GBoxedFreeFunc) g_free);
return our_type; return our_type;

5
clutter/clutter-actor.h
View File

@ -37,8 +37,9 @@ G_BEGIN_DECLS
#define CLUTTER_TYPE_GEOMETRY (clutter_geometry_get_type ()) #define CLUTTER_TYPE_GEOMETRY (clutter_geometry_get_type ())
#define CLUTTER_TYPE_ACTOR_BOX (clutter_actor_box_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) \ #define CLUTTER_ACTOR(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ACTOR, ClutterActor)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ACTOR, ClutterActor))
@ -154,7 +155,7 @@ struct _ClutterVertex
ClutterUnit z; ClutterUnit z;
}; };
GType clutter_vertices_get_type (void) G_GNUC_CONST; GType clutter_vertex_get_type (void) G_GNUC_CONST;
/** /**
* ClutterActor: * ClutterActor: