[gdm] manager: add #ifdef HAVE_LIBXDMCP in a couple places



commit 1423e4ddd08575982823352bfc140e47c4d93918
Author: Ray Strode <rstrode redhat com>
Date:   Sat Apr 1 12:20:22 2017 -0400

    manager: add #ifdef HAVE_LIBXDMCP in a couple places
    
    halfline: gdm fails to build in Continuous:
    http://build.gnome.org/continuous/buildmaster/builds/2017/04/01/11/build/log-gdm.txt
    
    gdm-manager.o: In function `set_up_session':
    /ostbuild/source/gdm/_build/daemon/../../daemon/gdm-manager.c:1453:
    undefined reference to `gdm_xdmcp_chooser_display_get_type'
    gdm-manager.o: In function `gdm_manager_handle_open_session':
    /ostbuild/source/gdm/_build/daemon/../../daemon/gdm-manager.c:846:
    undefined reference to `gdm_xdmcp_chooser_display_get_type'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=780813

 daemon/gdm-manager.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 2b5350e..c3bcfec 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -843,6 +843,7 @@ gdm_manager_handle_open_session (GdmDBusManager        *manager,
                 return TRUE;
         }
 
+#ifdef HAVE_LIBXDMCP
         if (GDM_IS_XDMCP_CHOOSER_DISPLAY (display)) {
                 GdmLaunchEnvironment *launch_environment;
 
@@ -859,7 +860,9 @@ gdm_manager_handle_open_session (GdmDBusManager        *manager,
                                                                        _("Chooser session unavailable"));
                         return TRUE;
                 }
-        } else {
+        }
+#endif
+        if (session == NULL) {
                 session = get_embryonic_user_session_for_display (display);
 
                 if (gdm_session_is_running (session)) {
@@ -1450,12 +1453,16 @@ set_up_session (GdmManager *manager,
                 autologin_enabled = get_automatic_login_details (manager, &username);
 
         if (!autologin_enabled) {
+                g_free (username);
+
+#ifdef HAVE_LIBXDMCP
                 if (GDM_IS_XDMCP_CHOOSER_DISPLAY (display)) {
                         set_up_chooser_session (manager, display);
-                } else {
-                        set_up_greeter_session (manager, display);
+                        return;
                 }
-                g_free (username);
+#endif
+
+                set_up_greeter_session (manager, display);
                 return;
         }
 


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