[gdm/wip/initial-setup2] asdfasdf



commit b168f36e23702f16be22b43da57a3229a9e361f7
Author: Ray Strode <rstrode redhat com>
Date:   Tue Apr 10 17:53:18 2012 -0400

    asdfasdf

 gui/initial-setup/gdm-initial-setup.c |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/gui/initial-setup/gdm-initial-setup.c b/gui/initial-setup/gdm-initial-setup.c
index 8f101dd..fad466d 100644
--- a/gui/initial-setup/gdm-initial-setup.c
+++ b/gui/initial-setup/gdm-initial-setup.c
@@ -1693,10 +1693,23 @@ connect_to_slave (SetupData *setup)
 }
 
 static void
-begin_autologin (SetupData *setup)
+on_ready_for_auto_login (GdmGreeterClient *client,
+                         SetupData        *setup)
 {
         const gchar *username;
 
+        username = act_user_get_user_name (setup->act_user);
+
+        g_debug ("Initiating autologin for %s", username);
+        gdm_greeter_client_call_begin_auto_login (setup->greeter_client, username);
+        gdm_greeter_client_call_start_session_when_ready (setup->greeter_client,
+                                                          "gdm-autologin",
+                                                          TRUE);
+}
+
+static void
+begin_autologin (SetupData *setup)
+{
         if (setup->greeter_client == NULL) {
                 g_warning ("No slave connection; not initiating autologin");
                 return;
@@ -1707,14 +1720,13 @@ begin_autologin (SetupData *setup)
                 return;
         }
 
-        username = act_user_get_user_name (setup->act_user);
-
-        g_debug ("Initiating autologin for %s", username);
+        g_debug ("Preparing to autologin");
 
-        gdm_greeter_client_call_begin_auto_login (setup->greeter_client, username);
-        gdm_greeter_client_call_start_session_when_ready (setup->greeter_client,
-                                                          "gdm-autologin",
-                                                          TRUE);
+        g_signal_connect (setup->greeter_client,
+                          "ready",
+                          G_CALLBACK (on_ready_for_auto_login),
+                          setup);
+        gdm_greeter_client_call_start_conversation (setup->greeter_client, "gdm-autologin");
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]