X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/blobdiff_plain/3c219c940aa3f4e771f8d581588ce63720628a80..53ad7ad44034f8fe041829525a190026497bdd30:/liblightdm-gobject/layout.c

diff --git a/liblightdm-gobject/layout.c b/liblightdm-gobject/layout.c
index 84ee4711..f22b6297 100644
--- a/liblightdm-gobject/layout.c
+++ b/liblightdm-gobject/layout.c
@@ -19,17 +19,17 @@ enum {
     PROP_DESCRIPTION
 };
 
-typedef struct
+struct _LightDMLayout
 {
+    GObject parent_instance;
+
     gchar *name;
     gchar *short_description;
     gchar *description;
-} LightDMLayoutPrivate;
+};
 
 G_DEFINE_TYPE (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;
@@ -211,7 +211,7 @@ const gchar *
 lightdm_layout_get_name (LightDMLayout *layout)
 {
     g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL);
-    return GET_PRIVATE (layout)->name;
+    return layout->name;
 }
 
 /**
@@ -226,7 +226,7 @@ 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;
+    return layout->short_description;
 }
 
 /**
@@ -241,7 +241,7 @@ const gchar *
 lightdm_layout_get_description (LightDMLayout *layout)
 {
     g_return_val_if_fail (LIGHTDM_IS_LAYOUT (layout), NULL);
-    return GET_PRIVATE (layout)->description;
+    return layout->description;
 }
 
 static void
@@ -256,20 +256,19 @@ lightdm_layout_set_property (GObject      *object,
                              GParamSpec   *pspec)
 {
     LightDMLayout *self = LIGHTDM_LAYOUT (object);
-    LightDMLayoutPrivate *priv = GET_PRIVATE (self);
 
     switch (prop_id) {
     case PROP_NAME:
-        g_free (priv->name);
-        priv->name = g_strdup (g_value_get_string (value));
+        g_free (self->name);
+        self->name = g_strdup (g_value_get_string (value));
         break;
     case PROP_SHORT_DESCRIPTION:
-        g_free (priv->short_description);
-        priv->short_description = g_strdup (g_value_get_string (value));
+        g_free (self->short_description);
+        self->short_description = g_strdup (g_value_get_string (value));
         break;
     case PROP_DESCRIPTION:
-        g_free (priv->description);
-        priv->description = g_strdup (g_value_get_string (value));
+        g_free (self->description);
+        self->description = g_strdup (g_value_get_string (value));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -308,8 +307,6 @@ lightdm_layout_class_init (LightDMLayoutClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMLayoutPrivate));
-
     object_class->set_property = lightdm_layout_set_property;
     object_class->get_property = lightdm_layout_get_property;