Merge branch 'wip/more-gdm-client-fixes' into 'master'

more gdm client fixes

See merge request GNOME/gdm!121

2 files changed, 62 insertions, 95 deletions

diff --git a/libgdm/gdm-client.c b/libgdm/gdm-client.c
index 5ac73944..fb58f1a4 100644
--- a/libgdm/gdm-client.c
+++ b/libgdm/gdm-client.c
@@ -41,6 +41,7 @@ struct _GdmClient
         GObject             parent;
 
         GdmUserVerifier    *user_verifier;
+        GdmUserVerifier    *user_verifier_for_reauth;
         GHashTable         *user_verifier_extensions;
 
         GdmGreeter         *greeter;
@@ -176,7 +177,7 @@ maybe_complete_user_verifier_proxy_operation (GdmClient          *client,
         GHashTableIter iter;
         gpointer key, value;
 
-        user_verifier_extensions = g_object_get_data (G_OBJECT (client->user_verifier), "gdm-client-user-verifier-extensions");
+        user_verifier_extensions = g_object_get_data (G_OBJECT (data->user_verifier), "gdm-client-user-verifier-extensions");
         if (user_verifier_extensions != NULL) {
                 g_hash_table_iter_init (&iter, user_verifier_extensions);
                 while (g_hash_table_iter_next (&iter, &key, &value)) {
@@ -569,6 +570,8 @@ gdm_client_open_reauthentication_channel_sync (GdmClient     *client,
                                                           cancellable,
                                                           error);
 
+        g_set_weak_pointer (&client->user_verifier_for_reauth, user_verifier);
+
         return user_verifier;
 }
 
@@ -628,9 +631,15 @@ gdm_client_open_reauthentication_channel_finish (GdmClient       *client,
                                                  GAsyncResult    *result,
                                                  GError         **error)
 {
+        GdmUserVerifier *user_verifier;
+
         g_return_val_if_fail (GDM_IS_CLIENT (client), NULL);
 
-        return g_task_propagate_pointer (G_TASK (result), error);
+        user_verifier = g_task_propagate_pointer (G_TASK (result), error);
+
+        g_set_weak_pointer (&client->user_verifier_for_reauth, user_verifier);
+
+        return user_verifier;
 }
 
 /**
@@ -650,6 +659,7 @@ gdm_client_get_user_verifier_sync (GdmClient     *client,
                                    GError       **error)
 {
         g_autoptr(GDBusConnection) connection = NULL;
+        GdmUserVerifier *user_verifier;
 
         if (client->user_verifier != NULL) {
                 return g_object_ref (client->user_verifier);
@@ -661,17 +671,16 @@ gdm_client_get_user_verifier_sync (GdmClient     *client,
                 return NULL;
         }
 
-        client->user_verifier = gdm_user_verifier_proxy_new_sync (connection,
-                                                                        G_DBUS_PROXY_FLAGS_NONE,
-                                                                        NULL,
-                                                                        SESSION_DBUS_PATH,
-                                                                        cancellable,
-                                                                        error);
+        user_verifier = gdm_user_verifier_proxy_new_sync (connection,
+                                                          G_DBUS_PROXY_FLAGS_NONE,
+                                                          NULL,
+                                                          SESSION_DBUS_PATH,
+                                                          cancellable,
+                                                          error);
+
+        g_set_weak_pointer (&client->user_verifier, user_verifier);
 
         if (client->user_verifier != NULL) {
-                g_object_add_weak_pointer (G_OBJECT (client->user_verifier),
-                                           (gpointer *)
-                                           &client->user_verifier);
                 if (client->enabled_extensions != NULL) {
                         GHashTable *user_verifier_extensions;
                         gboolean res;
@@ -807,17 +816,7 @@ gdm_client_get_user_verifier_finish (GdmClient       *client,
         if (user_verifier == NULL)
                 return NULL;
 
-        if (client->user_verifier != NULL) {
-                g_object_remove_weak_pointer (G_OBJECT (client->user_verifier),
-                                              (gpointer *)
-                                              &client->user_verifier);
-        }
-
-        g_object_add_weak_pointer (G_OBJECT (client->user_verifier),
-                                   (gpointer *)
-                                   &client->user_verifier);
-
-        client->user_verifier = user_verifier;
+        g_set_weak_pointer (&client->user_verifier, user_verifier);
 
         return user_verifier;
 }
@@ -835,9 +834,14 @@ gdm_client_get_user_verifier_finish (GdmClient       *client,
 GdmUserVerifierChoiceList *
 gdm_client_get_user_verifier_choice_list (GdmClient *client)
 {
-        GHashTable *user_verifier_extensions;
+        GHashTable *user_verifier_extensions = NULL;
+
+        if (client->user_verifier_for_reauth != NULL)
+                user_verifier_extensions = g_object_get_data (G_OBJECT (client->user_verifier_for_reauth), "gdm-client-user-verifier-extensions");
+
+        if (user_verifier_extensions == NULL && client->user_verifier != NULL)
+                user_verifier_extensions = g_object_get_data (G_OBJECT (client->user_verifier), "gdm-client-user-verifier-extensions");
 
-        user_verifier_extensions = g_object_get_data (G_OBJECT (client->user_verifier), "gdm-client-user-verifier-extensions");
         if (user_verifier_extensions == NULL)
                 return NULL;
 
@@ -980,11 +984,7 @@ gdm_client_get_greeter_finish (GdmClient       *client,
         if (greeter == NULL)
                 return NULL;
 
-        client->greeter = greeter;
-
-        g_object_add_weak_pointer (G_OBJECT (client->greeter),
-                                   (gpointer *)
-                                   &client->greeter);
+        g_set_weak_pointer (&client->greeter, greeter);
 
         return greeter;
 }
@@ -1008,6 +1008,7 @@ gdm_client_get_greeter_sync (GdmClient     *client,
                              GError       **error)
 {
         g_autoptr(GDBusConnection) connection = NULL;
+        GdmGreeter *greeter;
 
         if (client->greeter != NULL) {
                 return g_object_ref (client->greeter);
@@ -1019,18 +1020,16 @@ gdm_client_get_greeter_sync (GdmClient     *client,
                 return NULL;
         }
 
-        client->greeter = gdm_greeter_proxy_new_sync (connection,
-                                                            G_DBUS_PROXY_FLAGS_NONE,
-                                                            NULL,
-                                                            SESSION_DBUS_PATH,
-                                                            cancellable,
-                                                            error);
+        greeter = gdm_greeter_proxy_new_sync (connection,
+                                              G_DBUS_PROXY_FLAGS_NONE,
+                                              NULL,
+                                              SESSION_DBUS_PATH,
+                                              cancellable,
+                                              error);
 
-        if (client->greeter != NULL) {
-                g_object_add_weak_pointer (G_OBJECT (client->greeter),
-                                           (gpointer *)
-                                           &client->greeter);
+        g_set_weak_pointer (&client->greeter, greeter);
 
+        if (client->greeter != NULL) {
                 query_for_timed_login_requested_signal (client->greeter);
         }
 
@@ -1150,11 +1149,7 @@ gdm_client_get_remote_greeter_finish (GdmClient     *client,
         if (remote_greeter == NULL)
                 return NULL;
 
-        client->remote_greeter = remote_greeter;
-
-        g_object_add_weak_pointer (G_OBJECT (client->remote_greeter),
-                                   (gpointer *)
-                                   &client->remote_greeter);
+        g_set_weak_pointer (&client->remote_greeter, remote_greeter);
 
         return remote_greeter;
 }
@@ -1177,6 +1172,7 @@ gdm_client_get_remote_greeter_sync (GdmClient     *client,
                                     GError       **error)
 {
         g_autoptr(GDBusConnection) connection = NULL;
+        GdmRemoteGreeter *remote_greeter;
 
         if (client->remote_greeter != NULL) {
                 return g_object_ref (client->remote_greeter);
@@ -1188,18 +1184,14 @@ gdm_client_get_remote_greeter_sync (GdmClient     *client,
                 return NULL;
         }
 
-        client->remote_greeter = gdm_remote_greeter_proxy_new_sync (connection,
-                                                                          G_DBUS_PROXY_FLAGS_NONE,
-                                                                          NULL,
-                                                                          SESSION_DBUS_PATH,
-                                                                          cancellable,
-                                                                          error);
+        remote_greeter = gdm_remote_greeter_proxy_new_sync (connection,
+                                                            G_DBUS_PROXY_FLAGS_NONE,
+                                                            NULL,
+                                                            SESSION_DBUS_PATH,
+                                                            cancellable,
+                                                            error);
 
-        if (client->remote_greeter != NULL) {
-                g_object_add_weak_pointer (G_OBJECT (client->remote_greeter),
-                                           (gpointer *)
-                                           &client->remote_greeter);
-        }
+        g_set_weak_pointer (&client->remote_greeter, remote_greeter);
 
         return client->remote_greeter;
 }
@@ -1318,11 +1310,7 @@ gdm_client_get_chooser_finish (GdmClient       *client,
         if (chooser == NULL)
                 return NULL;
 
-        client->chooser = chooser;
-
-        g_object_add_weak_pointer (G_OBJECT (client->chooser),
-                                   (gpointer *)
-                                   &client->chooser);
+        g_set_weak_pointer (&client->chooser, chooser);
 
         return chooser;
 }
@@ -1345,6 +1333,7 @@ gdm_client_get_chooser_sync (GdmClient     *client,
                              GError       **error)
 {
         g_autoptr(GDBusConnection) connection = NULL;
+        GdmChooser *chooser;
 
         if (client->chooser != NULL) {
                 return g_object_ref (client->chooser);
@@ -1356,18 +1345,14 @@ gdm_client_get_chooser_sync (GdmClient     *client,
                 return NULL;
         }
 
-        client->chooser = gdm_chooser_proxy_new_sync (connection,
-                                                            G_DBUS_PROXY_FLAGS_NONE,
-                                                            NULL,
-                                                            SESSION_DBUS_PATH,
-                                                            cancellable,
-                                                            error);
+        chooser = gdm_chooser_proxy_new_sync (connection,
+                                              G_DBUS_PROXY_FLAGS_NONE,
+                                              NULL,
+                                              SESSION_DBUS_PATH,
+                                              cancellable,
+                                              error);
 
-        if (client->chooser != NULL) {
-                g_object_add_weak_pointer (G_OBJECT (client->chooser),
-                                           (gpointer *)
-                                           &client->chooser);
-        }
+        g_set_weak_pointer (&client->chooser, chooser);
 
         return client->chooser;
 }
@@ -1397,29 +1382,11 @@ gdm_client_finalize (GObject *object)
 
         g_return_if_fail (client != NULL);
 
-        if (client->user_verifier != NULL) {
-                g_object_remove_weak_pointer (G_OBJECT (client->user_verifier),
-                                              (gpointer *)
-                                              &client->user_verifier);
-        }
-
-        if (client->greeter != NULL) {
-                g_object_remove_weak_pointer (G_OBJECT (client->greeter),
-                                              (gpointer *)
-                                              &client->greeter);
-        }
-
-        if (client->remote_greeter != NULL) {
-                g_object_remove_weak_pointer (G_OBJECT (client->remote_greeter),
-                                              (gpointer *)
-                                              &client->remote_greeter);
-        }
-
-        if (client->chooser != NULL) {
-                g_object_remove_weak_pointer (G_OBJECT (client->chooser),
-                                              (gpointer *)
-                                              &client->chooser);
-        }
+        g_clear_weak_pointer (&client->user_verifier);
+        g_clear_weak_pointer (&client->user_verifier_for_reauth);
+        g_clear_weak_pointer (&client->greeter);
+        g_clear_weak_pointer (&client->remote_greeter);
+        g_clear_weak_pointer (&client->chooser);
 
         g_strfreev (client->enabled_extensions);
 
diff --git a/meson.build b/meson.build
index 7fb3f030..19f8fa9c 100644
--- a/meson.build
+++ b/meson.build
@@ -40,7 +40,7 @@ config_h_dir = include_directories('.')
 # Dependencies
 udev_dep = dependency('udev')
 
-glib_min_version = '2.44.0'
+glib_min_version = '2.56.0'
 
 glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
 gobject_dep = dependency('gobject-2.0', version: '>=' + glib_min_version)