From dd6ec064803ad196be78ca52c7820495d00b70e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <wangshuai2@kylinos.cn>
Date: Thu, 13 Apr 2023 17:00:51 +0800
Subject: [PATCH] =?UTF-8?q?deal=20bug130487=20=E8=A7=A3=E5=86=B3=E5=BC=80?=
 =?UTF-8?q?=E6=9C=BA=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=BC=80=E6=9C=BA=E8=87=AA=E5=8A=A8=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=9C=A8=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E4=B8=AD?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/daemon.c | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/daemon.c b/src/daemon.c
index 45b8320..37d4769 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1583,25 +1583,31 @@ load_autologin (Daemon      *daemon,
                                                NULL,  /* GCancellable */
                                                NULL); /* GError */
 
+        // if (proxy != NULL) {
+        //         ret = load_autologin_gdm (daemon, name, enabled, error);
+        //         if (ret == FALSE) {
+        //                 g_warning ("%s fail to load %s file\n", __func__, PATH_GDM_CUSTOM);
+        //         }
+        // }
+        // /*
+	//  * if /etc/gdm3/custom.conf not find we need check /etc/lightdm/lightdm.conf;       
+	//  */
+        // if (ret == FALSE) {
+        //       ret = load_autologin_lightdm (daemon, name, enabled, error);
+        //       if (ret == FALSE) {
+        //               g_warning ("%s fail to load /etc/lightdm/lightdm.conf file\n", __func__);
+        //       }
+        // }
+
         if (proxy != NULL) {
-                ret = load_autologin_gdm (daemon, name, enabled, error);
+                ret = load_autologin_lightdm (daemon, name, enabled, error);
                 if (ret == FALSE) {
-                        g_warning ("%s fail to load %s file\n", __func__, PATH_GDM_CUSTOM);
+                        g_warning ("%s fail to load /etc/lightdm/lightdm.conf file\n", __func__);
                 }
         }
-        /*
-	 * if /etc/gdm3/custom.conf not find we need check /etc/lightdm/lightdm.conf;       
-	 */
-        if (ret == FALSE) {
-              ret = load_autologin_lightdm (daemon, name, enabled, error);
-              if (ret == FALSE) {
-                      g_warning ("%s fail to load /etc/lightdm/lightdm.conf file\n", __func__);
-              }
-        }
-
         return ret;
 }
-
+#if 0
 static gboolean
 save_autologin_gdm (Daemon      *daemon,
                     const gchar *name,
@@ -1636,7 +1642,7 @@ save_autologin_gdm (Daemon      *daemon,
 
         return result;
 }
-
+#endif
 static gboolean
 save_autologin_lightdm (Daemon      *daemon,
                         const gchar *name,
@@ -1677,8 +1683,8 @@ save_autologin (Daemon      *daemon,
                 gboolean     enabled,
                 GError     **error)
 {
-        if (!save_autologin_gdm (daemon, name, enabled, error))
-                return FALSE;
+        //if (!save_autologin_gdm (daemon, name, enabled, error))
+        //        return FALSE;
         if (!save_autologin_lightdm (daemon, name, enabled, error))
                 return FALSE;
         return TRUE;