[mutter/wayland] wayland-stage: Clean up and rename

[Jasper St. Pierre <jstpierre src gnome org>]

commit 57803f1d59b51512ac6a3541e4f92a1f9e99f81a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Mar 31 23:54:25 2014 -0400

    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 :)

 src/wayland/meta-wayland-stage.c |    2 +-
 src/wayland/meta-wayland-stage.h |   26 ++++++--------------------
 2 files changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/src/wayland/meta-wayland-stage.c b/src/wayland/meta-wayland-stage.c
index 16cb753..b795dd5 100644
--- a/src/wayland/meta-wayland-stage.c
+++ b/src/wayland/meta-wayland-stage.c
@@ -62,7 +62,7 @@ meta_wayland_stage_init (MetaWaylandStage *self)
 ClutterActor *
 meta_wayland_stage_new (void)
 {
-  return g_object_new (META_WAYLAND_TYPE_STAGE,
+  return g_object_new (META_TYPE_WAYLAND_STAGE,
                        "cursor-visible", FALSE,
                        NULL);
 }
diff --git a/src/wayland/meta-wayland-stage.h b/src/wayland/meta-wayland-stage.h
index c242fbd..4dcfb64 100644
--- a/src/wayland/meta-wayland-stage.h
+++ b/src/wayland/meta-wayland-stage.h
@@ -27,26 +27,12 @@
 
 G_BEGIN_DECLS
 
-#define META_WAYLAND_TYPE_STAGE                                         \
-  (meta_wayland_stage_get_type())
-#define META_WAYLAND_STAGE(obj)                                         \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               META_WAYLAND_TYPE_STAGE,                 \
-                               MetaWaylandStage))
-#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))
+#define META_TYPE_WAYLAND_STAGE            (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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_WAYLAND_STAGE, 
MetaWaylandStageClass))
+#define META_IS_WAYLAND_STAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_WAYLAND_STAGE))
+#define META_IS_WAYLAND_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_WAYLAND_STAGE))
+#define META_WAYLAND_STAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_WAYLAND_STAGE, 
MetaWaylandStageClass))
 
 typedef struct _MetaWaylandStage      MetaWaylandStage;
 typedef struct _MetaWaylandStageClass MetaWaylandStageClass;