summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-08-30 16:21:09 -0700
committerEmmanuele Bassi <ebassi@gnome.org>2012-10-13 18:12:37 +0100
commitc0b3a4611e7415d9f6baa5f4e643e05de9f8ca8d (patch)
treee72cb36e0615a8c62f9a2ed248d365adfda832b8
parent3f0e3c11ea6b5c719ed0c87c5afd22267cb8b580 (diff)
downloadclutter-c0b3a4611e7415d9f6baa5f4e643e05de9f8ca8d.tar.gz
Hide clutter_input_device_wayland and clutter_stage_wayland types
By prefixing them with an underscore, so they don't get exported as part of public ABI. Signed-off-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit a33d84234f516599a888a8eb798f9f45d3c4cdc5) Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
-rw-r--r--clutter/wayland/clutter-input-device-wayland.c3
-rw-r--r--clutter/wayland/clutter-input-device-wayland.h4
-rw-r--r--clutter/wayland/clutter-stage-wayland.c2
-rw-r--r--clutter/wayland/clutter-stage-wayland.h4
4 files changed, 9 insertions, 4 deletions
diff --git a/clutter/wayland/clutter-input-device-wayland.c b/clutter/wayland/clutter-input-device-wayland.c
index 89c8fc569..39ab989f2 100644
--- a/clutter/wayland/clutter-input-device-wayland.c
+++ b/clutter/wayland/clutter-input-device-wayland.c
@@ -49,6 +49,9 @@
typedef struct _ClutterInputDeviceClass ClutterInputDeviceWaylandClass;
+#define clutter_input_device_wayland_get_type \
+ _clutter_input_device_wayland_get_type
+
G_DEFINE_TYPE (ClutterInputDeviceWayland,
clutter_input_device_wayland,
CLUTTER_TYPE_INPUT_DEVICE);
diff --git a/clutter/wayland/clutter-input-device-wayland.h b/clutter/wayland/clutter-input-device-wayland.h
index fc79ffbbc..22de8b1cf 100644
--- a/clutter/wayland/clutter-input-device-wayland.h
+++ b/clutter/wayland/clutter-input-device-wayland.h
@@ -33,7 +33,7 @@
#include "clutter-device-manager-private.h"
#include "cogl/clutter-stage-cogl.h"
-#define CLUTTER_TYPE_INPUT_DEVICE_WAYLAND (clutter_input_device_wayland_get_type ())
+#define CLUTTER_TYPE_INPUT_DEVICE_WAYLAND (_clutter_input_device_wayland_get_type ())
#define CLUTTER_INPUT_DEVICE_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_INPUT_DEVICE_WAYLAND, ClutterInputDeviceWayland))
#define CLUTTER_IS_INPUT_DEVICE_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_INPUT_DEVICE_WAYLAND))
@@ -55,7 +55,7 @@ struct _ClutterInputDeviceWayland
gboolean is_initial_repeat;
};
-GType clutter_input_device_wayland_get_type (void) G_GNUC_CONST;
+GType _clutter_input_device_wayland_get_type (void) G_GNUC_CONST;
extern const struct wl_seat_listener _clutter_seat_wayland_listener;
diff --git a/clutter/wayland/clutter-stage-wayland.c b/clutter/wayland/clutter-stage-wayland.c
index 727a9cad0..ce0e05a3f 100644
--- a/clutter/wayland/clutter-stage-wayland.c
+++ b/clutter/wayland/clutter-stage-wayland.c
@@ -44,6 +44,8 @@ static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;
static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
+#define clutter_stage_wayland_get_type _clutter_stage_wayland_get_type
+
G_DEFINE_TYPE_WITH_CODE (ClutterStageWayland,
clutter_stage_wayland,
CLUTTER_TYPE_STAGE_COGL,
diff --git a/clutter/wayland/clutter-stage-wayland.h b/clutter/wayland/clutter-stage-wayland.h
index ea56624e3..3c7eb4209 100644
--- a/clutter/wayland/clutter-stage-wayland.h
+++ b/clutter/wayland/clutter-stage-wayland.h
@@ -36,7 +36,7 @@
#include "cogl/clutter-stage-cogl.h"
-#define CLUTTER_TYPE_STAGE_WAYLAND (clutter_stage_wayland_get_type ())
+#define CLUTTER_TYPE_STAGE_WAYLAND (_clutter_stage_wayland_get_type ())
#define CLUTTER_STAGE_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_WAYLAND, ClutterStageWayland))
#define CLUTTER_IS_STAGE_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_WAYLAND))
#define CLUTTER_STAGE_WAYLAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_WAYLAND, ClutterStageWaylandClass))
@@ -60,6 +60,6 @@ struct _ClutterStageWaylandClass
ClutterStageCoglClass parent_class;
};
-GType clutter_stage_wayland_get_type (void) G_GNUC_CONST;
+GType _clutter_stage_wayland_get_type (void) G_GNUC_CONST;
#endif /* __CLUTTER_STAGE_WAYLAND_H__ */