connect_to_server -> connect_sync, start_session -> start_session_sync

2 files changed, 18 insertions, 56 deletions

diff --git a/doc/lightdm-gobject-1-sections.txt b/doc/lightdm-gobject-1-sections.txt
index 0e71ca85..e3d1821d 100644
--- a/doc/lightdm-gobject-1-sections.txt
+++ b/doc/lightdm-gobject-1-sections.txt
@@ -118,17 +118,14 @@ LIGHTDM_USER_LIST_GET_CLASS
 <SECTION>
 <FILE>greeter</FILE>
 <TITLE>Greeter Interface</TITLE>
-connected
 autologin_timer_expired
 show_message
 show_prompt
 authentication_complete
-session_failed
-quit
 LightDMMessageType
 LightDMPromptType
 lightdm_greeter_new
-lightdm_greeter_connect_to_server
+lightdm_greeter_connect_sync
 lightdm_greeter_get_default_session_hint
 lightdm_greeter_get_hint
 lightdm_greeter_get_has_guest_account_hint
@@ -146,8 +143,7 @@ lightdm_greeter_cancel_authentication
 lightdm_greeter_get_in_authentication
 lightdm_greeter_get_is_authenticated
 lightdm_greeter_get_authentication_user
-lightdm_greeter_start_session
-lightdm_greeter_start_default_session
+lightdm_greeter_start_session_sync
 <SUBSECTION Standard>
 LIGHTDM_GREETER
 LIGHTDM_IS_GREETER
diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml
index c3e2761e..d12b2998 100644
--- a/doc/tmpl/greeter.sgml
+++ b/doc/tmpl/greeter.sgml
@@ -16,22 +16,25 @@ int main ()
 {
     LightDMGreeter *greeter = lightdm_greeter_new ();
 
-    g_object_connect (greeter, "connected", G_CALLBACK (connected_cb), NULL);
     g_object_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL);
     g_object_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
-    g_object_connect (greeter, "session-failed", G_CALLBACK (session_failed_cb), NULL);
-    g_object_connect (greeter, "quit", G_CALLBACK (quit_cb), NULL);
 
-    if (!lightdm_greeter_connect_to_server (LIGHTDM_GREETER (greeter))) {
+    if (!lightdm_greeter_connect_sync (LIGHTDM_GREETER (greeter))) {
         // Log an error
-        return 0;
+        return EXIT_FAILURE;
     }
-}
 
-static void connected_cb (LightDMGreeter *greeter)
-{
-    // Start authentication
-    lightdm_greeter_authenticate (greeter, NULL);
+    while (TRUE)
+    {
+        // Start authentication
+        while (!lightdm_greeter_get_is_authenticated (greeter))
+            lightdm_greeter_authenticate (greeter, NULL);
+
+        if (lightdm_greeter_start_session_sync (greeter, NULL))
+            return EXIT_SUCCESS;
+    }
+
+    return EXIT_SUCCESS;
 }
 
 static void show_prompt_cb (LightDMGreeter *greeter, const char *text, LightDMPromptType type)
@@ -55,12 +58,6 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
     }
 }
 
-static void session_failed_cb (LightDMGreeter *greeter)
-{
-    // Display a warning and reset the greeter
-    reset_login_screen (``Failed to login'');
-}
-
 static void quit_cb (LightDMGreeter *greeter)
 {
     // Clean up
@@ -83,14 +80,6 @@ static void quit_cb (LightDMGreeter *greeter)
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### USER_FUNCTION connected ##### -->
-<para>
-
-</para>
-
-@greeter: 
-
-
 <!-- ##### USER_FUNCTION autologin_timer_expired ##### -->
 <para>
 
@@ -127,22 +116,6 @@ static void quit_cb (LightDMGreeter *greeter)
 @greeter: 
 
 
-<!-- ##### USER_FUNCTION session_failed ##### -->
-<para>
-
-</para>
-
-@greeter: 
-
-
-<!-- ##### USER_FUNCTION quit ##### -->
-<para>
-
-</para>
-
-@greeter: 
-
-
 <!-- ##### ENUM LightDMMessageType ##### -->
 <para>
 
@@ -168,7 +141,7 @@ static void quit_cb (LightDMGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION lightdm_greeter_connect_to_server ##### -->
+<!-- ##### FUNCTION lightdm_greeter_connect_sync ##### -->
 <para>
 
 </para>
@@ -328,20 +301,13 @@ static void quit_cb (LightDMGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION lightdm_greeter_start_session ##### -->
+<!-- ##### FUNCTION lightdm_greeter_start_session_sync ##### -->
 <para>
 
 </para>
 
 @greeter: 
 @session: 
-
-
-<!-- ##### FUNCTION lightdm_greeter_start_default_session ##### -->
-<para>
-
-</para>
-
-@greeter: 
+@Returns: