diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c index 8946cafeb..e163338cb 100644 --- a/src/backends/meta-barrier.c +++ b/src/backends/meta-barrier.c @@ -302,7 +302,7 @@ meta_barrier_destroy (MetaBarrier *barrier) static void meta_barrier_init (MetaBarrier *barrier) { - barrier->priv = G_TYPE_INSTANCE_GET_PRIVATE (barrier, META_TYPE_BARRIER, MetaBarrierPrivate); + barrier->priv = meta_barrier_get_instance_private (barrier); } void diff --git a/src/compositor/meta-module.c b/src/compositor/meta-module.c index 0283b4a9a..d5aa64846 100644 --- a/src/compositor/meta-module.c +++ b/src/compositor/meta-module.c @@ -41,9 +41,6 @@ struct _MetaModulePrivate GType plugin_type; }; -#define META_MODULE_GET_PRIVATE(obj) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_MODULE, MetaModulePrivate)) - G_DEFINE_TYPE_WITH_PRIVATE (MetaModule, meta_module, G_TYPE_TYPE_MODULE); static gboolean @@ -192,7 +189,7 @@ meta_module_class_init (MetaModuleClass *klass) static void meta_module_init (MetaModule *self) { - self->priv = META_MODULE_GET_PRIVATE (self); + self->priv = meta_module_get_instance_private (self); } GType diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c index 3dd0b07ec..33c00989e 100644 --- a/src/compositor/plugins/default.c +++ b/src/compositor/plugins/default.c @@ -50,9 +50,6 @@ #define META_IS_DEFAULT_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_DEFAULT_PLUGIN)) #define META_DEFAULT_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginClass)) -#define META_DEFAULT_PLUGIN_GET_PRIVATE(obj) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginPrivate)) - typedef struct _MetaDefaultPlugin MetaDefaultPlugin; typedef struct _MetaDefaultPluginClass MetaDefaultPluginClass; typedef struct _MetaDefaultPluginPrivate MetaDefaultPluginPrivate; @@ -218,7 +215,7 @@ meta_default_plugin_init (MetaDefaultPlugin *self) { MetaDefaultPluginPrivate *priv; - self->priv = priv = META_DEFAULT_PLUGIN_GET_PRIVATE (self); + self->priv = priv = meta_default_plugin_get_instance_private (self); priv->info.name = "Default Effects"; priv->info.version = "0.1";