diff options
Diffstat (limited to 'liblightdm-gobject/layout.c')
| -rw-r--r-- | liblightdm-gobject/layout.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/liblightdm-gobject/layout.c b/liblightdm-gobject/layout.c index 27b9f1c1..ff8d8749 100644 --- a/liblightdm-gobject/layout.c +++ b/liblightdm-gobject/layout.c @@ -49,8 +49,6 @@ typedef struct G_DEFINE_TYPE_WITH_PRIVATE (LightDMLayout, lightdm_layout, G_TYPE_OBJECT) -#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayoutPrivate) - static gboolean have_layouts = FALSE; static Display *display = NULL; static XklEngine *xkl_engine = NULL; @@ -213,7 +211,9 @@ const gchar * lightdm_layout_get_name (LightDMLayout *layout) { g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL); - return GET_PRIVATE (layout)->name; + + LightDMLayoutPrivate *priv = lightdm_layout_get_instance_private (layout); + return priv->name; } /** @@ -228,7 +228,9 @@ const gchar * lightdm_layout_get_short_description (LightDMLayout *layout) { g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL); - return GET_PRIVATE (layout)->short_description; + + LightDMLayoutPrivate *priv = lightdm_layout_get_instance_private (layout); + return priv->short_description; } /** @@ -243,7 +245,9 @@ const gchar * lightdm_layout_get_description (LightDMLayout *layout) { g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL); - return GET_PRIVATE (layout)->description; + + LightDMLayoutPrivate *priv = lightdm_layout_get_instance_private (layout); + return priv->description; } static void @@ -258,7 +262,7 @@ lightdm_layout_set_property (GObject *object, GParamSpec *pspec) { LightDMLayout *self = LIGHTDM_LAYOUT (object); - LightDMLayoutPrivate *priv = GET_PRIVATE (self); + LightDMLayoutPrivate *priv = lightdm_layout_get_instance_private (self); switch (prop_id) { case PROP_NAME: @@ -307,7 +311,7 @@ static void lightdm_layout_finalize (GObject *object) { LightDMLayout *self = LIGHTDM_LAYOUT (object); - LightDMLayoutPrivate *priv = GET_PRIVATE (self); + LightDMLayoutPrivate *priv = lightdm_layout_get_instance_private (self); g_free (priv->name); g_free (priv->short_description); |