Revert r2392 - it seems to have broken ABI in liblightdm-gobject

1 files changed, 35 insertions, 51 deletions

diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 6e3c93ed..07aa2371 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -95,7 +95,9 @@ typedef struct
     gboolean cancelling_authentication;
 } LightDMGreeterPrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (LightDMGreeter, lightdm_greeter, G_TYPE_OBJECT);
+G_DEFINE_TYPE (LightDMGreeter, lightdm_greeter, G_TYPE_OBJECT);
+
+#define GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterPrivate)
 
 #define HEADER_SIZE 8
 #define MAX_MESSAGE_LENGTH 1024
@@ -233,7 +235,7 @@ lightdm_greeter_set_resettable (LightDMGreeter *greeter, gboolean resettable)
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_if_fail (!priv->connected);
     priv->resettable = resettable;
@@ -282,7 +284,7 @@ static gboolean
 timed_login_cb (gpointer data)
 {
     LightDMGreeter *greeter = data;
-    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
 
     priv->autologin_timeout = 0;
     g_signal_emit (G_OBJECT (greeter), signals[AUTOLOGIN_TIMER_EXPIRED], 0);
@@ -402,7 +404,7 @@ get_message_length (guint8 *message, gsize message_length)
 static gboolean
 connect_to_daemon (LightDMGreeter *greeter, GError **error)
 {
-    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     const gchar *to_server_fd, *from_server_fd, *pipe_path;
 
     if (priv->to_server_channel || priv->from_server_channel)
@@ -454,7 +456,7 @@ connect_to_daemon (LightDMGreeter *greeter, GError **error)
 static gboolean
 send_message (LightDMGreeter *greeter, guint8 *message, gsize message_length, GError **error)
 {
-    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     gchar *data;
     gsize data_length;
     guint32 stated_length;
@@ -515,7 +517,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     gchar *version;
     GString *hint_string;
     int timeout;
@@ -560,7 +562,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     guint32 sequence_number, n_messages, i;
     gchar *username;
 
@@ -628,7 +630,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     guint32 sequence_number, return_code;
     gchar *username;
 
@@ -670,7 +672,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     GString *hint_string;
 
     g_hash_table_remove_all (priv->hints);
@@ -695,7 +697,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     Request *request;
 
     /* Notify asynchronous caller */
@@ -719,7 +721,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     Request *request;
 
     /* Notify asynchronous caller */
@@ -781,7 +783,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 = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     gsize n_to_read, n_read;
 
     if (!connect_to_daemon (greeter, error))
@@ -945,7 +947,7 @@ lightdm_greeter_connect_to_daemon (LightDMGreeter *greeter, GCancellable *cancel
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     request = request_new (greeter, cancellable, callback, user_data);
     if (send_connect (greeter, priv->resettable, &error))
@@ -997,7 +999,7 @@ lightdm_greeter_connect_to_daemon_sync (LightDMGreeter *greeter, GError **error)
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     /* Read until we are connected */
     if (!send_connect (greeter, priv->resettable, error))
@@ -1047,13 +1049,8 @@ 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);
-
-    priv = lightdm_greeter_get_instance_private (greeter);
-
-    return g_hash_table_lookup (priv->hints, name);
+    return g_hash_table_lookup (GET_PRIVATE (greeter)->hints, name);
 }
 
 /**
@@ -1281,7 +1278,7 @@ lightdm_greeter_cancel_autologin (LightDMGreeter *greeter)
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     if (priv->autologin_timeout)
        g_source_remove (priv->autologin_timeout);
@@ -1307,7 +1304,7 @@ lightdm_greeter_authenticate (LightDMGreeter *greeter, const gchar *username, GE
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1346,7 +1343,7 @@ lightdm_greeter_authenticate_as_guest (LightDMGreeter *greeter, GError **error)
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1410,7 +1407,7 @@ lightdm_greeter_authenticate_remote (LightDMGreeter *greeter, const gchar *sessi
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1453,7 +1450,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 = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
     g_return_val_if_fail (priv->n_responses_waiting > 0, FALSE);
@@ -1508,7 +1505,7 @@ lightdm_greeter_cancel_authentication (LightDMGreeter *greeter, GError **error)
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1528,13 +1525,8 @@ 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);
-
-    priv = lightdm_greeter_get_instance_private (greeter);
-
-    return priv->in_authentication;
+    return GET_PRIVATE (greeter)->in_authentication;
 }
 
 /**
@@ -1548,13 +1540,8 @@ 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);
-
-    priv = lightdm_greeter_get_instance_private (greeter);
-
-    return priv->is_authenticated;
+    return GET_PRIVATE (greeter)->is_authenticated;
 }
 
 /**
@@ -1568,13 +1555,8 @@ 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);
-
-    priv = lightdm_greeter_get_instance_private (greeter);
-
-    return priv->authentication_user;
+    return GET_PRIVATE (greeter)->authentication_user;
 }
 
 /**
@@ -1596,7 +1578,7 @@ lightdm_greeter_set_language (LightDMGreeter *greeter, const gchar *language, GE
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
 
@@ -1628,7 +1610,7 @@ lightdm_greeter_start_session (LightDMGreeter *greeter, const gchar *session, GC
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     request = request_new (greeter, cancellable, callback, user_data);
     priv->start_session_requests = g_list_append (priv->start_session_requests, request);
@@ -1679,7 +1661,7 @@ lightdm_greeter_start_session_sync (LightDMGreeter *greeter, const gchar *sessio
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, FALSE);
     g_return_val_if_fail (priv->is_authenticated, FALSE);
@@ -1731,7 +1713,7 @@ lightdm_greeter_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *us
 
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_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);
@@ -1791,7 +1773,7 @@ lightdm_greeter_ensure_shared_data_dir_sync (LightDMGreeter *greeter, const gcha
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
 
-    priv = lightdm_greeter_get_instance_private (greeter);
+    priv = GET_PRIVATE (greeter);
 
     g_return_val_if_fail (priv->connected, NULL);
 
@@ -1817,7 +1799,7 @@ lightdm_greeter_ensure_shared_data_dir_sync (LightDMGreeter *greeter, const gcha
 static void
 lightdm_greeter_init (LightDMGreeter *greeter)
 {
-    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (greeter);
+    LightDMGreeterPrivate *priv = GET_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);
@@ -1895,7 +1877,7 @@ static void
 lightdm_greeter_finalize (GObject *object)
 {
     LightDMGreeter *self = LIGHTDM_GREETER (object);
-    LightDMGreeterPrivate *priv = lightdm_greeter_get_instance_private (self);
+    LightDMGreeterPrivate *priv = GET_PRIVATE (self);
 
     g_clear_object (&priv->socket);
     if (priv->to_server_channel)
@@ -1926,6 +1908,8 @@ 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;