wayland-stage: Clean up and rename

It should be META_TYPE_WAYLAND_STAGE, not META_WAYLAND_TYPE_STAGE.

Well, actually, it *should* be META_TYPE_NATIVE_STAGE, because it's
not related to Wayland at all. But that comes later :)
This commit is contained in:
Jasper St. Pierre 2014-03-31 23:54:25 -04:00
parent 67b6737b27
commit 57803f1d59
2 changed files with 7 additions and 21 deletions

View File

@ -62,7 +62,7 @@ meta_wayland_stage_init (MetaWaylandStage *self)
ClutterActor * ClutterActor *
meta_wayland_stage_new (void) meta_wayland_stage_new (void)
{ {
return g_object_new (META_WAYLAND_TYPE_STAGE, return g_object_new (META_TYPE_WAYLAND_STAGE,
"cursor-visible", FALSE, "cursor-visible", FALSE,
NULL); NULL);
} }

View File

@ -27,26 +27,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define META_WAYLAND_TYPE_STAGE \ #define META_TYPE_WAYLAND_STAGE (meta_wayland_stage_get_type ())
(meta_wayland_stage_get_type()) #define META_WAYLAND_STAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WAYLAND_STAGE, MetaWaylandStage))
#define META_WAYLAND_STAGE(obj) \ #define META_WAYLAND_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_WAYLAND_STAGE, MetaWaylandStageClass))
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ #define META_IS_WAYLAND_STAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_WAYLAND_STAGE))
META_WAYLAND_TYPE_STAGE, \ #define META_IS_WAYLAND_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_WAYLAND_STAGE))
MetaWaylandStage)) #define META_WAYLAND_STAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_WAYLAND_STAGE, MetaWaylandStageClass))
#define META_WAYLAND_STAGE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \
META_WAYLAND_TYPE_STAGE, \
MetaWaylandStageClass))
#define META_WAYLAND_IS_STAGE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
META_WAYLAND_TYPE_STAGE))
#define META_WAYLAND_IS_STAGE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
META_WAYLAND_TYPE_STAGE))
#define META_WAYLAND_STAGE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
META_WAYLAND_STAGE, \
MetaWaylandStageClass))
typedef struct _MetaWaylandStage MetaWaylandStage; typedef struct _MetaWaylandStage MetaWaylandStage;
typedef struct _MetaWaylandStageClass MetaWaylandStageClass; typedef struct _MetaWaylandStageClass MetaWaylandStageClass;