Use G_DECLARE_*_TYPE to simplify code and fix docs

11 files changed, 191 insertions, 356 deletions

diff --git a/configure.ac b/configure.ac
index d0a0f178..5a0a6538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_CHECK_HEADERS(gcrypt.h, [], AC_MSG_ERROR(libgcrypt not found))
 AC_CHECK_FUNCS(setresgid setresuid clearenv)
 
 PKG_CHECK_MODULES(LIGHTDM, [
-    glib-2.0 >= 2.40
+    glib-2.0 >= 2.44
     gio-2.0 >= 2.26
     gio-unix-2.0
     xdmcp
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 07aa2371..6e3c93ed 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -95,9 +95,7 @@ typedef struct
     gboolean cancelling_authentication;
 } LightDMGreeterPrivate;
 
-G_DEFINE_TYPE (LightDMGreeter, lightdm_greeter, G_TYPE_OBJECT);
-
-#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterPrivate)
+G_DEFINE_TYPE_WITH_PRIVATE (LightDMGreeter, lightdm_greeter, G_TYPE_OBJECT);
 
 #define HEADER_SIZE 8
 #define MAX_MESSAGE_LENGTH 1024
@@ -235,7 +233,7 @@ lightdm_greeter_set_resettable (LightDMGreeter *greeter, gboolean resettable)
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_if_fail (!priv->connected);
     priv->resettable = resettable;
@@ -284,7 +282,7 @@ static gboolean
 timed_login_cb (gpointer data)
 {
     LightDMGreeter *greeter = data;
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
 
     priv->autologin_timeout = 0;
     g_signal_emit (G_OBJECT (greeter), signals[AUTOLOGIN_TIMER_EXPIRED], 0);
@@ -404,7 +402,7 @@ get_message_length (guint8 *message, gsize message_length)
 static gboolean
 connect_to_daemon (LightDMGreeter *greeter, GError **error)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     const gchar *to_server_fd, *from_server_fd, *pipe_path;
 
     if (priv->to_server_channel || priv->from_server_channel)
@@ -456,7 +454,7 @@ connect_to_daemon (LightDMGreeter *greeter, GError **error)
 static gboolean
 send_message (LightDMGreeter *greeter, guint8 *message, gsize message_length, GError **error)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     gchar *data;
     gsize data_length;
     guint32 stated_length;
@@ -517,7 +515,7 @@ send_message (LightDMGreeter *greeter, guint8 *message, gsize message_length, GE
 static void
 handle_connected (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     gchar *version;
     GString *hint_string;
     int timeout;
@@ -562,7 +560,7 @@ handle_connected (LightDMGreeter *greeter, guint8 *message, gsize message_length
 static void
 handle_prompt_authentication (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     guint32 sequence_number, n_messages, i;
     gchar *username;
 
@@ -630,7 +628,7 @@ handle_prompt_authentication (LightDMGreeter *greeter, guint8 *message, gsize me
 static void
 handle_end_authentication (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     guint32 sequence_number, return_code;
     gchar *username;
 
@@ -672,7 +670,7 @@ handle_idle (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsi
 static void
 handle_reset (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     GString *hint_string;
 
     g_hash_table_remove_all (priv->hints);
@@ -697,7 +695,7 @@ handle_reset (LightDMGreeter *greeter, guint8 *message, gsize message_length, gs
 static void
 handle_session_result (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     Request *request;
 
     /* Notify asynchronous caller */
@@ -721,7 +719,7 @@ handle_session_result (LightDMGreeter *greeter, guint8 *message, gsize message_l
 static void
 handle_shared_dir_result (LightDMGreeter *greeter, guint8 *message, gsize message_length, gsize *offset)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     Request *request;
 
     /* Notify asynchronous caller */
@@ -783,7 +781,7 @@ handle_message (LightDMGreeter *greeter, guint8 *message, gsize message_length)
 static gboolean
 recv_message (LightDMGreeter *greeter, gboolean block, guint8 **message, gsize *length, GError **error)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
     gsize n_to_read, n_read;
 
     if (!connect_to_daemon (greeter, error))
@@ -947,7 +945,7 @@ lightdm_greeter_connect_to_daemon (LightDMGreeter *greeter, GCancellable *cancel
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     request = request_new (greeter, cancellable, callback, user_data);
     if (send_connect (greeter, priv->resettable, &error))
@@ -999,7 +997,7 @@ lightdm_greeter_connect_to_daemon_sync (LightDMGreeter *greeter, GError **error)
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     /* Read until we are connected */
     if (!send_connect (greeter, priv->resettable, error))
@@ -1049,8 +1047,13 @@ lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error)
 const gchar *
 lightdm_greeter_get_hint (LightDMGreeter *greeter, const gchar *name)
 {
+    LightDMGreeterPrivate *priv;
+
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
-    return g_hash_table_lookup (GET_PRIVATE (greeter)->hints, name);
+
+    priv = lightdm_greeter_get_instance_private (greeter);
+
+    return g_hash_table_lookup (priv->hints, name);
 }
 
 /**
@@ -1278,7 +1281,7 @@ lightdm_greeter_cancel_autologin (LightDMGreeter *greeter)
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     if (priv->autologin_timeout)
        g_source_remove (priv->autologin_timeout);
@@ -1304,7 +1307,7 @@ lightdm_greeter_authenticate (LightDMGreeter *greeter, const gchar *username, GE
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1343,7 +1346,7 @@ lightdm_greeter_authenticate_as_guest (LightDMGreeter *greeter, GError **error)
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1407,7 +1410,7 @@ lightdm_greeter_authenticate_remote (LightDMGreeter *greeter, const gchar *sessi
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1450,7 +1453,7 @@ lightdm_greeter_respond (LightDMGreeter *greeter, const gchar *response, GError
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
     g_return_val_if_fail (response != NULL, FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
     g_return_val_if_fail (priv->n_responses_waiting > 0, FALSE);
@@ -1505,7 +1508,7 @@ lightdm_greeter_cancel_authentication (LightDMGreeter *greeter, GError **error)
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1525,8 +1528,13 @@ lightdm_greeter_cancel_authentication (LightDMGreeter *greeter, GError **error)
 gboolean
 lightdm_greeter_get_in_authentication (LightDMGreeter *greeter)
 {
+    LightDMGreeterPrivate *priv;
+
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
-    return GET_PRIVATE (greeter)->in_authentication;
+
+    priv = lightdm_greeter_get_instance_private (greeter);
+
+    return priv->in_authentication;
 }
 
 /**
@@ -1540,8 +1548,13 @@ lightdm_greeter_get_in_authentication (LightDMGreeter *greeter)
 gboolean
 lightdm_greeter_get_is_authenticated (LightDMGreeter *greeter)
 {
+    LightDMGreeterPrivate *priv;
+
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
-    return GET_PRIVATE (greeter)->is_authenticated;
+
+    priv = lightdm_greeter_get_instance_private (greeter);
+
+    return priv->is_authenticated;
 }
 
 /**
@@ -1555,8 +1568,13 @@ lightdm_greeter_get_is_authenticated (LightDMGreeter *greeter)
 const gchar *
 lightdm_greeter_get_authentication_user (LightDMGreeter *greeter)
 {
+    LightDMGreeterPrivate *priv;
+
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
-    return GET_PRIVATE (greeter)->authentication_user;
+
+    priv = lightdm_greeter_get_instance_private (greeter);
+
+    return priv->authentication_user;
 }
 
 /**
@@ -1578,7 +1596,7 @@ lightdm_greeter_set_language (LightDMGreeter *greeter, const gchar *language, GE
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1610,7 +1628,7 @@ lightdm_greeter_start_session (LightDMGreeter *greeter, const gchar *session, GC
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     request = request_new (greeter, cancellable, callback, user_data);
     priv->start_session_requests = g_list_append (priv->start_session_requests, request);
@@ -1661,7 +1679,7 @@ lightdm_greeter_start_session_sync (LightDMGreeter *greeter, const gchar *sessio
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
     g_return_val_if_fail (priv->is_authenticated, FALSE);
@@ -1713,7 +1731,7 @@ lightdm_greeter_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *us
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     request = request_new (greeter, cancellable, callback, user_data);
     priv->ensure_shared_data_dir_requests = g_list_append (priv->ensure_shared_data_dir_requests, request);
@@ -1773,7 +1791,7 @@ lightdm_greeter_ensure_shared_data_dir_sync (LightDMGreeter *greeter, const gcha
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
 
-    priv = GET_PRIVATE (greeter);
+    priv = lightdm_greeter_get_instance_private (greeter);
 
     g_return_val_if_fail (priv->connected, NULL);
 
@@ -1799,7 +1817,7 @@ lightdm_greeter_ensure_shared_data_dir_sync (LightDMGreeter *greeter, const gcha
 static void
 lightdm_greeter_init (LightDMGreeter *greeter)
 {
-    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
 
     priv->read_buffer = g_malloc (HEADER_SIZE);
     priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
@@ -1877,7 +1895,7 @@ static void
 lightdm_greeter_finalize (GObject *object)
 {
     LightDMGreeter *self = LIGHTDM_GREETER (object);
-    LightDMGreeterPrivate *priv = GET_PRIVATE (self);
+    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (self);
 
     g_clear_object (&priv->socket);
     if (priv->to_server_channel)
@@ -1908,8 +1926,6 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMGreeterPrivate));
-
     object_class->set_property = lightdm_greeter_set_property;
     object_class->get_property = lightdm_greeter_get_property;
     object_class->finalize = lightdm_greeter_finalize;
diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c
index ac17645c..8234f098 100644
--- a/liblightdm-gobject/language.c
+++ b/liblightdm-gobject/language.c
@@ -22,17 +22,17 @@ enum {
     PROP_TERRITORY
 };
 
-typedef struct
+struct _LightDMLanguage
 {
+    GObject parent_instance;
+
     gchar *code;
     gchar *name;
     gchar *territory;
-} LightDMLanguagePrivate;
+};
 
 G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TYPE_OBJECT);
 
-#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguagePrivate)
-
 static gboolean have_languages = FALSE;
 static GList *languages = NULL;
 
@@ -201,7 +201,7 @@ const gchar *
 lightdm_language_get_code (LightDMLanguage *language)
 {
     g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), NULL);
-    return GET_PRIVATE (language)->code;
+    return language->code;
 }
 
 /**
@@ -215,15 +215,11 @@ lightdm_language_get_code (LightDMLanguage *language)
 const gchar *
 lightdm_language_get_name (LightDMLanguage *language)
 {
-    LightDMLanguagePrivate *priv;
-
     g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), NULL);
 
-    priv = GET_PRIVATE (language);
-
-    if (!priv->name)
+    if (!language->name)
     {
-        gchar *locale = get_locale_name (priv->code);
+        gchar *locale = get_locale_name (language->code);
         if (locale)
         {
             gchar *current = setlocale (LC_ALL, NULL);
@@ -232,19 +228,19 @@ lightdm_language_get_name (LightDMLanguage *language)
 
             gchar *language_en = nl_langinfo (_NL_IDENTIFICATION_LANGUAGE);
             if (language_en && strlen (language_en) > 0)
-                priv->name = g_strdup (dgettext ("iso_639_3", language_en));
+                language->name = g_strdup (dgettext ("iso_639_3", language_en));
 
             setlocale (LC_ALL, current);
         }
-        if (!priv->name)
+        if (!language->name)
         {
-            gchar **tokens = g_strsplit_set (priv->code, "_.@", 2);
-            priv->name = g_strdup (tokens[0]);
+            gchar **tokens = g_strsplit_set (language->code, "_.@", 2);
+            language->name = g_strdup (tokens[0]);
             g_strfreev (tokens);
         }
     }
 
-    return priv->name;
+    return language->name;
 }
 
 /**
@@ -258,15 +254,11 @@ lightdm_language_get_name (LightDMLanguage *language)
 const gchar *
 lightdm_language_get_territory (LightDMLanguage *language)
 {
-    LightDMLanguagePrivate *priv;
-
     g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), NULL);
 
-    priv = GET_PRIVATE (language);
-
-    if (!priv->territory && strchr (priv->code, '_'))
+    if (!language->territory && strchr (language->code, '_'))
     {
-        gchar *locale = get_locale_name (priv->code);
+        gchar *locale = get_locale_name (language->code);
         if (locale)
         {
             gchar *current = setlocale (LC_ALL, NULL);
@@ -275,19 +267,19 @@ lightdm_language_get_territory (LightDMLanguage *language)
 
             gchar *country_en = nl_langinfo (_NL_IDENTIFICATION_TERRITORY);
             if (country_en && strlen (country_en) > 0 && g_strcmp0 (country_en, "ISO") != 0)
-                priv->territory = g_strdup (dgettext ("iso_3166", country_en));
+                language->territory = g_strdup (dgettext ("iso_3166", country_en));
 
             setlocale (LC_ALL, current);
         }
-        if (!priv->territory)
+        if (!language->territory)
         {
-            gchar **tokens = g_strsplit_set (priv->code, "_.@", 3);
-            priv->territory = g_strdup (tokens[1]);
+            gchar **tokens = g_strsplit_set (language->code, "_.@", 3);
+            language->territory = g_strdup (tokens[1]);
             g_strfreev (tokens);
         }
     }
 
-    return priv->territory;
+    return language->territory;
 }
 
 /**
@@ -302,23 +294,19 @@ lightdm_language_get_territory (LightDMLanguage *language)
 gboolean
 lightdm_language_matches (LightDMLanguage *language, const gchar *code)
 {
-    LightDMLanguagePrivate *priv;
-
     g_return_val_if_fail (LIGHTDM_IS_LANGUAGE (language), FALSE);
     g_return_val_if_fail (code != NULL, FALSE);
 
-    priv = GET_PRIVATE (language);
-
     /* Handle the fact the UTF-8 is specified both as '.utf8' and '.UTF-8' */
-    if (is_utf8 (priv->code) && is_utf8 (code))
+    if (is_utf8 (language->code) && is_utf8 (code))
     {
         /* Match the characters before the '.' */
         int i;
-        for (i = 0; priv->code[i] && code[i] && priv->code[i] == code[i] && code[i] != '.' ; i++);
-        return priv->code[i] == '.' && code[i] == '.';
+        for (i = 0; language->code[i] && code[i] && language->code[i] == code[i] && code[i] != '.' ; i++);
+        return language->code[i] == '.' && code[i] == '.';
     }
 
-    return g_str_equal (priv->code, code);
+    return g_str_equal (language->code, code);
 }
 
 static void
@@ -333,12 +321,11 @@ lightdm_language_set_property (GObject      *object,
                                GParamSpec   *pspec)
 {
     LightDMLanguage *self = LIGHTDM_LANGUAGE (object);
-    LightDMLanguagePrivate *priv = GET_PRIVATE (self);
 
     switch (prop_id) {
     case PROP_CODE:
-        g_free (priv->name);
-        priv->code = g_strdup (g_value_get_string (value));
+        g_free (self->name);
+        self->code = g_strdup (g_value_get_string (value));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -377,8 +364,6 @@ lightdm_language_class_init (LightDMLanguageClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMLanguagePrivate));
-
     object_class->set_property = lightdm_language_set_property;
     object_class->get_property = lightdm_language_get_property;
 
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;
 
diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index 922068b5..c9cbae90 100644
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -16,12 +16,9 @@
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_GREETER            (lightdm_greeter_get_type())
-#define LIGHTDM_GREETER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeter))
-#define LIGHTDM_GREETER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
-#define LIGHTDM_IS_GREETER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_GREETER))
-#define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER))
-#define LIGHTDM_GREETER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
+#define LIGHTDM_TYPE_GREETER (lightdm_greeter_get_type())
+
+G_DECLARE_DERIVABLE_TYPE (LightDMGreeter, lightdm_greeter, LIGHTDM, GREETER, GObject)
 
 #define LIGHTDM_GREETER_ERROR lightdm_greeter_error_quark ()
 
@@ -58,12 +55,7 @@ typedef enum
 
 GType lightdm_message_type_get_type (void);
 
-typedef struct
-{
-    GObject parent_instance;
-} LightDMGreeter;
-
-typedef struct
+struct _LightDMGreeterClass
 {
     GObjectClass parent_class;
 
@@ -79,15 +71,7 @@ typedef struct
     void (*reserved2) (void);
     void (*reserved3) (void);
     void (*reserved4) (void);
-} LightDMGreeterClass;
-
-#ifdef GLIB_VERSION_2_44
-typedef LightDMGreeter *LightDMGreeter_autoptr;
-static inline void glib_autoptr_cleanup_LightDMGreeter (LightDMGreeter **_ptr)
-{
-    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
-}
-#endif
+};
 
 /**
  * LightDMGreeterError:
@@ -110,8 +94,6 @@ GQuark lightdm_greeter_error_quark (void);
 
 GType lightdm_greeter_error_get_type (void);
 
-GType lightdm_greeter_get_type (void);
-
 LightDMGreeter *lightdm_greeter_new (void);
 
 void lightdm_greeter_set_resettable (LightDMGreeter *greeter, gboolean resettable);
diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h
index 6c3f83bc..7f33c43c 100644
--- a/liblightdm-gobject/lightdm/language.h
+++ b/liblightdm-gobject/lightdm/language.h
@@ -15,40 +15,15 @@
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_LANGUAGE            (lightdm_language_get_type())
-#define LIGHTDM_LANGUAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguage));
-#define LIGHTDM_LANGUAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass))
-#define LIGHTDM_IS_LANGUAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LANGUAGE))
-#define LIGHTDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LANGUAGE))
-#define LIGHTDM_LANGUAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass))
+#define LIGHTDM_TYPE_LANGUAGE (lightdm_language_get_type())
 
-typedef struct
-{
-    GObject parent_instance;
-} LightDMLanguage;
+G_DECLARE_FINAL_TYPE (LightDMLanguage, lightdm_language, LIGHTDM, LANGUAGE, GObject)
 
-typedef struct
+struct _LightDMLanguageClass
 {
+    /*< private >*/
     GObjectClass parent_class;
-
-    /* Reserved */
-    void (*reserved1) (void);
-    void (*reserved2) (void);
-    void (*reserved3) (void);
-    void (*reserved4) (void);
-    void (*reserved5) (void);
-    void (*reserved6) (void);
-} LightDMLanguageClass;
-
-#ifdef GLIB_VERSION_2_44
-typedef LightDMLanguage *LightDMLanguage_autoptr;
-static inline void glib_autoptr_cleanup_LightDMLanguage (LightDMLanguage **_ptr)
-{
-    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
-}
-#endif
-
-GType lightdm_language_get_type (void);
+};
 
 GList *lightdm_get_languages (void);
 
diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h
index c971980b..f4369504 100644
--- a/liblightdm-gobject/lightdm/layout.h
+++ b/liblightdm-gobject/lightdm/layout.h
@@ -15,40 +15,15 @@
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_LAYOUT            (lightdm_layout_get_type())
-#define LIGHTDM_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayout));
-#define LIGHTDM_LAYOUT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass))
-#define LIGHTDM_IS_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LAYOUT))
-#define LIGHTDM_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LAYOUT))
-#define LIGHTDM_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass))
+#define LIGHTDM_TYPE_LAYOUT (lightdm_layout_get_type())
 
-typedef struct
-{
-    GObject parent_instance;
-} LightDMLayout;
+G_DECLARE_FINAL_TYPE (LightDMLayout, lightdm_layout, LIGHTDM, LAYOUT, GObject)
 
-typedef struct
+struct _LightDMLayoutClass
 {
+    /*< private >*/
     GObjectClass parent_class;
-
-    /* Reserved */
-    void (*reserved1) (void);
-    void (*reserved2) (void);
-    void (*reserved3) (void);
-    void (*reserved4) (void);
-    void (*reserved5) (void);
-    void (*reserved6) (void);
-} LightDMLayoutClass;
-
-#ifdef GLIB_VERSION_2_44
-typedef LightDMLayout *LightDMLayout_autoptr;
-static inline void glib_autoptr_cleanup_LightDMLayout (LightDMLayout **_ptr)
-{
-    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
-}
-#endif
-
-GType lightdm_layout_get_type (void);
+};
 
 GList *lightdm_get_layouts (void);
 
diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h
index 9c447e1f..f8a4a10f 100644
--- a/liblightdm-gobject/lightdm/session.h
+++ b/liblightdm-gobject/lightdm/session.h
@@ -15,40 +15,15 @@
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_SESSION            (lightdm_session_get_type())
-#define LIGHTDM_SESSION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_SESSION, LightDMSession));
-#define LIGHTDM_SESSION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_SESSION, LightDMSessionClass))
-#define LIGHTDM_IS_SESSION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_SESSION))
-#define LIGHTDM_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_SESSION))
-#define LIGHTDM_SESSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_SESSION, LightDMSessionClass))
-
-typedef struct
-{
-    GObject parent_instance;
-} LightDMSession;
-
-typedef struct
+struct _LightDMSessionClass
 {
+    /*< private >*/
     GObjectClass parent_class;
+};
 
-    /* Reserved */
-    void (*reserved1) (void);
-    void (*reserved2) (void);
-    void (*reserved3) (void);
-    void (*reserved4) (void);
-    void (*reserved5) (void);
-    void (*reserved6) (void);
-} LightDMSessionClass;
-
-#ifdef GLIB_VERSION_2_44
-typedef LightDMSession *LightDMSession_autoptr;
-static inline void glib_autoptr_cleanup_LightDMSession (LightDMSession **_ptr)
-{
-    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
-}
-#endif
+#define LIGHTDM_TYPE_SESSION (lightdm_session_get_type())
 
-GType lightdm_session_get_type (void);
+G_DECLARE_FINAL_TYPE (LightDMSession, lightdm_session, LIGHTDM, SESSION, GObject)
 
 GList *lightdm_get_sessions (void);
 
diff --git a/liblightdm-gobject/lightdm/user.h b/liblightdm-gobject/lightdm/user.h
index d092477a..63b7c567 100644
--- a/liblightdm-gobject/lightdm/user.h
+++ b/liblightdm-gobject/lightdm/user.h
@@ -15,83 +15,31 @@
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_USER_LIST            (lightdm_user_list_get_type())
-#define LIGHTDM_USER_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserList));
-#define LIGHTDM_USER_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER_LIST, LightDMUserListClass))
-#define LIGHTDM_IS_USER_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_USER_LIST))
-#define LIGHTDM_IS_USER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER_LIST))
-#define LIGHTDM_USER_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserListClass))
-
-#define LIGHTDM_TYPE_USER            (lightdm_user_get_type())
-#define LIGHTDM_USER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER, LightDMUser));
-#define LIGHTDM_USER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER, LightDMUserClass))
-#define LIGHTDM_IS_USER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_USER))
-#define LIGHTDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER))
-#define LIGHTDM_USER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_USER, LightDMUserClass))
+#define LIGHTDM_TYPE_USER (lightdm_user_get_type())
 
-#define LIGHTDM_USER_LIST_SIGNAL_USER_ADDED   "user-added"
-#define LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED "user-changed"
-#define LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED "user-removed"
+G_DECLARE_FINAL_TYPE (LightDMUser, lightdm_user, LIGHTDM, USER, GObject)
 
 #define LIGHTDM_SIGNAL_USER_CHANGED "changed"
 
-typedef struct
-{
-    GObject parent_instance;
-} LightDMUser;
-
-typedef struct
+struct _LightDMUserClass
 {
+    /*< private >*/
     GObjectClass parent_class;
-    void (*changed)(LightDMUser *user);
-
-    /* Reserved */
-    void (*reserved1) (void);
-    void (*reserved2) (void);
-    void (*reserved3) (void);
-    void (*reserved4) (void);
-    void (*reserved5) (void);
-    void (*reserved6) (void);
-} LightDMUserClass;
-
-typedef struct
-{
-    GObject parent_instance;
-} LightDMUserList;
+};
 
-typedef struct
-{
-    GObjectClass parent_class;
+#define LIGHTDM_TYPE_USER_LIST (lightdm_user_list_get_type())
 
-    void (*user_added)(LightDMUserList *user_list, LightDMUser *user);
-    void (*user_changed)(LightDMUserList *user_list, LightDMUser *user);
-    void (*user_removed)(LightDMUserList *user_list, LightDMUser *user);
-
-    /* Reserved */
-    void (*reserved1) (void);
-    void (*reserved2) (void);
-    void (*reserved3) (void);
-    void (*reserved4) (void);
-    void (*reserved5) (void);
-    void (*reserved6) (void);
-} LightDMUserListClass;
-
-#ifdef GLIB_VERSION_2_44
-typedef LightDMUser *LightDMUser_autoptr;
-static inline void glib_autoptr_cleanup_LightDMUser (LightDMUser **_ptr)
-{
-    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
-}
-typedef LightDMUserList *LightDMUserList_autoptr;
-static inline void glib_autoptr_cleanup_LightDMUserList (LightDMUserList **_ptr)
-{
-    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
-}
-#endif
+G_DECLARE_FINAL_TYPE (LightDMUserList, lightdm_user_list, LIGHTDM, USER_LIST, GObject)
 
-GType lightdm_user_list_get_type (void);
+#define LIGHTDM_USER_LIST_SIGNAL_USER_ADDED   "user-added"
+#define LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED "user-changed"
+#define LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED "user-removed"
 
-GType lightdm_user_get_type (void);
+struct _LightDMUserListClass
+{
+    /*< private >*/
+    GObjectClass parent_class;
+};
 
 LightDMUserList *lightdm_user_list_get_instance (void);
 
diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c
index 7549e0bb..fbbc5f79 100644
--- a/liblightdm-gobject/session.c
+++ b/liblightdm-gobject/session.c
@@ -20,18 +20,16 @@ enum {
     PROP_COMMENT
 };
 
-typedef struct
+struct _LightDMSession
 {
     gchar *key;
     gchar *type;
     gchar *name;
     gchar *comment;
-} LightDMSessionPrivate;
+};
 
 G_DEFINE_TYPE (LightDMSession, lightdm_session, G_TYPE_OBJECT);
 
-#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_SESSION, LightDMSessionPrivate)
-
 static gboolean have_sessions = FALSE;
 static GList *local_sessions = NULL;
 static GList *remote_sessions = NULL;
@@ -39,9 +37,8 @@ static GList *remote_sessions = NULL;
 static gint
 compare_session (gconstpointer a, gconstpointer b)
 {
-    LightDMSessionPrivate *priv_a = GET_PRIVATE (a);
-    LightDMSessionPrivate *priv_b = GET_PRIVATE (b);
-    return strcmp (priv_a->name, priv_b->name);
+    const LightDMSession *sa = a, *sb = b;
+    return strcmp (sa->name, sb->name);
 }
 
 static LightDMSession *
@@ -49,7 +46,6 @@ load_session (GKeyFile *key_file, const gchar *key, const gchar *default_type)
 {
     gchar *domain, *name, *type;
     LightDMSession *session;
-    LightDMSessionPrivate *priv;
     gchar *try_exec;
 
     if (g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, NULL) ||
@@ -91,21 +87,20 @@ load_session (GKeyFile *key_file, const gchar *key, const gchar *default_type)
         type = strdup (default_type);
 
     session = g_object_new (LIGHTDM_TYPE_SESSION, NULL);
-    priv = GET_PRIVATE (session);
 
-    g_free (priv->key);
-    priv->key = g_strdup (key);
+    g_free (session->key);
+    session->key = g_strdup (key);
 
-    g_free (priv->type);
-    priv->type = type;
+    g_free (session->type);
+    session->type = type;
 
-    g_free (priv->name);
-    priv->name = name;
+    g_free (session->name);
+    session->name = name;
 
-    g_free (priv->comment);
-    priv->comment = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_COMMENT, domain, NULL);
-    if (!priv->comment)
-        priv->comment = g_strdup ("");
+    g_free (session->comment);
+    session->comment = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_COMMENT, domain, NULL);
+    if (!session->comment)
+        session->comment = g_strdup ("");
 
     g_free (domain);
 
@@ -156,7 +151,7 @@ load_sessions_dir (GList *sessions, const gchar *sessions_dir, const gchar *defa
             session = load_session (key_file, key, default_type);
             if (session)
             {
-                g_debug ("Loaded session %s (%s, %s)", path, GET_PRIVATE (session)->name, GET_PRIVATE (session)->comment);
+                g_debug ("Loaded session %s (%s, %s)", path, session->name, session->comment);
                 sessions = g_list_insert_sorted (sessions, session, compare_session);
             }
             else
@@ -275,7 +270,7 @@ const gchar *
 lightdm_session_get_key (LightDMSession *session)
 {
     g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL);
-    return GET_PRIVATE (session)->key;
+    return session->key;
 }
 
 /**
@@ -290,7 +285,7 @@ const gchar *
 lightdm_session_get_session_type (LightDMSession *session)
 {
     g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL);
-    return GET_PRIVATE (session)->type;
+    return session->type;
 }
 
 /**
@@ -305,7 +300,7 @@ const gchar *
 lightdm_session_get_name (LightDMSession *session)
 {
     g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL);
-    return GET_PRIVATE (session)->name;
+    return session->name;
 }
 
 /**
@@ -320,7 +315,7 @@ const gchar *
 lightdm_session_get_comment (LightDMSession *session)
 {
     g_return_val_if_fail (LIGHTDM_IS_SESSION (session), NULL);
-    return GET_PRIVATE (session)->comment;
+    return session->comment;
 }
 
 static void
@@ -367,12 +362,11 @@ static void
 lightdm_session_finalize (GObject *object)
 {
     LightDMSession *self = LIGHTDM_SESSION (object);
-    LightDMSessionPrivate *priv = GET_PRIVATE (self);
 
-    g_free (priv->key);
-    g_free (priv->type);
-    g_free (priv->name);
-    g_free (priv->comment);
+    g_free (self->key);
+    g_free (self->type);
+    g_free (self->name);
+    g_free (self->comment);
 }
 
 static void
@@ -380,8 +374,6 @@ lightdm_session_class_init (LightDMSessionClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMSessionPrivate));
-
     object_class->set_property = lightdm_session_set_property;
     object_class->get_property = lightdm_session_get_property;
     object_class->finalize = lightdm_session_finalize;
diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c
index e47d563b..905dc2c8 100644
--- a/liblightdm-gobject/user.c
+++ b/liblightdm-gobject/user.c
@@ -57,25 +57,27 @@ enum
 };
 static guint user_signals[LAST_USER_SIGNAL] = { 0 };
 
-typedef struct
+struct _LightDMUserList
 {
+    GObject parent_instance;
+
     gboolean initialized;
 
     /* Wrapper list, kept locally to preserve transfer-none promises */
     GList *lightdm_list;
-} LightDMUserListPrivate;
+};
 
-typedef struct
+G_DEFINE_TYPE (LightDMUserList, lightdm_user_list, G_TYPE_OBJECT);
+
+struct _LightDMUser
 {
+    GObject parent_instance;
+
     CommonUser *common_user;
-} LightDMUserPrivate;
+};
 
-G_DEFINE_TYPE (LightDMUserList, lightdm_user_list, G_TYPE_OBJECT);
 G_DEFINE_TYPE (LightDMUser, lightdm_user, G_TYPE_OBJECT);
 
-#define GET_LIST_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserListPrivate)
-#define GET_USER_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_USER, LightDMUserPrivate)
-
 static LightDMUserList *singleton = NULL;
 
 /**
@@ -110,35 +112,31 @@ wrap_common_user (CommonUser *user)
 static void
 user_list_added_cb (CommonUserList *common_list, CommonUser *common_user, LightDMUserList *user_list)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GList *common_users = common_user_list_get_users (common_list);
     LightDMUser *lightdm_user = wrap_common_user (common_user);
-    priv->lightdm_list = g_list_insert (priv->lightdm_list, lightdm_user, g_list_index (common_users, common_user));
+    user_list->lightdm_list = g_list_insert (user_list->lightdm_list, lightdm_user, g_list_index (common_users, common_user));
     g_signal_emit (user_list, list_signals[USER_ADDED], 0, lightdm_user);
 }
 
 static void
 user_list_changed_cb (CommonUserList *common_list, CommonUser *common_user, LightDMUserList *user_list)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GList *common_users = common_user_list_get_users (common_list);
-    LightDMUser *lightdm_user = g_list_nth_data (priv->lightdm_list, g_list_index (common_users, common_user));
+    LightDMUser *lightdm_user = g_list_nth_data (user_list->lightdm_list, g_list_index (common_users, common_user));
     g_signal_emit (user_list, list_signals[USER_CHANGED], 0, lightdm_user);
 }
 
 static void
 user_list_removed_cb (CommonUserList *common_list, CommonUser *common_user, LightDMUserList *user_list)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GList *link;
 
-    for (link = priv->lightdm_list; link; link = link->next)
+    for (link = user_list->lightdm_list; link; link = link->next)
     {
         LightDMUser *lightdm_user = link->data;
-        LightDMUserPrivate *user_priv = GET_USER_PRIVATE (lightdm_user);
-        if (user_priv->common_user == common_user)
+        if (lightdm_user->common_user == common_user)
         {
-            priv->lightdm_list = g_list_delete_link (priv->lightdm_list, link);
+            user_list->lightdm_list = g_list_delete_link (user_list->lightdm_list, link);
             g_signal_emit (user_list, list_signals[USER_REMOVED], 0, lightdm_user);
             g_object_unref (lightdm_user);
             break;
@@ -149,11 +147,10 @@ user_list_removed_cb (CommonUserList *common_list, CommonUser *common_user, Ligh
 static void
 initialize_user_list_if_needed (LightDMUserList *user_list)
 {
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (user_list);
     GList *common_users;
     GList *link;
 
-    if (priv->initialized)
+    if (user_list->initialized)
         return;
 
     common_users = common_user_list_get_users (common_user_list_get_instance ());
@@ -161,16 +158,16 @@ initialize_user_list_if_needed (LightDMUserList *user_list)
     {
         CommonUser *user = link->data;
         LightDMUser *lightdm_user = wrap_common_user (user);
-        priv->lightdm_list = g_list_prepend (priv->lightdm_list, lightdm_user);
+        user_list->lightdm_list = g_list_prepend (user_list->lightdm_list, lightdm_user);
     }
-    priv->lightdm_list = g_list_reverse (priv->lightdm_list);
+    user_list->lightdm_list = g_list_reverse (user_list->lightdm_list);
 
     CommonUserList *common_list = common_user_list_get_instance ();
     g_signal_connect (common_list, USER_LIST_SIGNAL_USER_ADDED, G_CALLBACK (user_list_added_cb), user_list);
     g_signal_connect (common_list, USER_LIST_SIGNAL_USER_CHANGED, G_CALLBACK (user_list_changed_cb), user_list);
     g_signal_connect (common_list, USER_LIST_SIGNAL_USER_REMOVED, G_CALLBACK (user_list_removed_cb), user_list);
 
-    priv->initialized = TRUE;
+    user_list->initialized = TRUE;
 }
 
 /**
@@ -184,7 +181,7 @@ lightdm_user_list_get_length (LightDMUserList *user_list)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), 0);
     initialize_user_list_if_needed (user_list);
-    return g_list_length (GET_LIST_PRIVATE (user_list)->lightdm_list);
+    return g_list_length (user_list->lightdm_list);
 }
 
 /**
@@ -201,7 +198,7 @@ lightdm_user_list_get_users (LightDMUserList *user_list)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER_LIST (user_list), NULL);
     initialize_user_list_if_needed (user_list);
-    return GET_LIST_PRIVATE (user_list)->lightdm_list;
+    return user_list->lightdm_list;
 }
 
 /**
@@ -223,7 +220,7 @@ lightdm_user_list_get_user_by_name (LightDMUserList *user_list, const gchar *use
 
     initialize_user_list_if_needed (user_list);
 
-    for (link = GET_LIST_PRIVATE (user_list)->lightdm_list; link; link = link->next)
+    for (link = user_list->lightdm_list; link; link = link->next)
     {
         LightDMUser *user = link->data;
         if (g_strcmp0 (lightdm_user_get_name (user), username) == 0)
@@ -273,9 +270,8 @@ static void
 lightdm_user_list_finalize (GObject *object)
 {
     LightDMUserList *self = LIGHTDM_USER_LIST (object);
-    LightDMUserListPrivate *priv = GET_LIST_PRIVATE (self);
 
-    g_list_free_full (priv->lightdm_list, g_object_unref);
+    g_list_free_full (self->lightdm_list, g_object_unref);
 
     G_OBJECT_CLASS (lightdm_user_list_parent_class)->finalize (object);
 }
@@ -285,8 +281,6 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMUserListPrivate));
-
     object_class->set_property = lightdm_user_list_set_property;
     object_class->get_property = lightdm_user_list_get_property;
     object_class->finalize = lightdm_user_list_finalize;
@@ -325,7 +319,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
         g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_ADDED,
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserListClass, user_added),
+                      0,
                       NULL, NULL,
                       NULL,
                       G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
@@ -341,7 +335,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
         g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_CHANGED,
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserListClass, user_changed),
+                      0,
                       NULL, NULL,
                       NULL,
                       G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
@@ -357,7 +351,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
         g_signal_new (LIGHTDM_USER_LIST_SIGNAL_USER_REMOVED,
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserListClass, user_removed),
+                      0,
                       NULL, NULL,
                       NULL,
                       G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
@@ -375,7 +369,7 @@ const gchar *
 lightdm_user_get_name (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_name (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_name (user->common_user);
 }
 
 /**
@@ -390,7 +384,7 @@ const gchar *
 lightdm_user_get_real_name (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_real_name (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_real_name (user->common_user);
 }
 
 /**
@@ -405,7 +399,7 @@ const gchar *
 lightdm_user_get_display_name (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_display_name (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_display_name (user->common_user);
 }
 
 /**
@@ -420,7 +414,7 @@ const gchar *
 lightdm_user_get_home_directory (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_home_directory (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_home_directory (user->common_user);
 }
 
 /**
@@ -435,7 +429,7 @@ const gchar *
 lightdm_user_get_image (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_image (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_image (user->common_user);
 }
 
 /**
@@ -450,7 +444,7 @@ const gchar *
 lightdm_user_get_background (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_background (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_background (user->common_user);
 }
 
 /**
@@ -465,7 +459,7 @@ const gchar *
 lightdm_user_get_language (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_language (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_language (user->common_user);
 }
 
 /**
@@ -480,7 +474,7 @@ const gchar *
 lightdm_user_get_layout (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_layout (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_layout (user->common_user);
 }
 
 /**
@@ -495,7 +489,7 @@ const gchar * const *
 lightdm_user_get_layouts (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_layouts (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_layouts (user->common_user);
 }
 
 /**
@@ -510,7 +504,7 @@ const gchar *
 lightdm_user_get_session (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
-    return common_user_get_session (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_session (user->common_user);
 }
 
 /**
@@ -525,7 +519,7 @@ gboolean
 lightdm_user_get_logged_in (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE);
-    return common_user_get_logged_in (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_logged_in (user->common_user);
 }
 
 /**
@@ -540,7 +534,7 @@ gboolean
 lightdm_user_get_has_messages (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), FALSE);
-    return common_user_get_has_messages (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_has_messages (user->common_user);
 }
 
 /**
@@ -555,7 +549,7 @@ uid_t
 lightdm_user_get_uid (LightDMUser *user)
 {
     g_return_val_if_fail (LIGHTDM_IS_USER (user), (uid_t)-1);
-    return common_user_get_uid (GET_USER_PRIVATE (user)->common_user);
+    return common_user_get_uid (user->common_user);
 }
 
 static void
@@ -570,12 +564,11 @@ lightdm_user_set_property (GObject    *object,
                            GParamSpec *pspec)
 {
     LightDMUser *self = LIGHTDM_USER (object);
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (self);
 
     switch (prop_id)
     {
     case USER_PROP_COMMON_USER:
-        priv->common_user = g_value_dup_object (value);
+        self->common_user = g_value_dup_object (value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -644,9 +637,8 @@ static void
 lightdm_user_finalize (GObject *object)
 {
     LightDMUser *self = LIGHTDM_USER (object);
-    LightDMUserPrivate *priv = GET_USER_PRIVATE (self);
 
-    g_object_unref (priv->common_user);
+    g_object_unref (self->common_user);
 
     G_OBJECT_CLASS (lightdm_user_parent_class)->finalize (object);
 }
@@ -656,8 +648,6 @@ lightdm_user_class_init (LightDMUserClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LightDMUserPrivate));
-
     object_class->set_property = lightdm_user_set_property;
     object_class->get_property = lightdm_user_get_property;
     object_class->finalize = lightdm_user_finalize;
@@ -765,13 +755,13 @@ lightdm_user_class_init (LightDMUserClass *klass)
      * LightDMUser::changed:
      * @user: A #LightDMUser
      *
-     * The ::changed signal gets emitted this user account is modified.
+     * The ::changed signal gets emitted when this user account is modified.
      **/
     user_signals[CHANGED] =
         g_signal_new (LIGHTDM_SIGNAL_USER_CHANGED,
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (LightDMUserClass, changed),
+                      0,
                       NULL, NULL,
                       NULL,
                       G_TYPE_NONE, 0);