!49 fix class member initialization order problems

From: @hou-hongxun 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-fix-initialization-order-problem-of-class-members.patch

@@ -0,0 +1,83 @@
+From 8df4ddf1e025693144f40db6aceaa0420c1a00ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Tue, 30 Apr 2024 15:39:30 +0800
+Subject: [PATCH] fix initialization order problem of class members
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ tools/mainwindow.cpp        | 2 +-
+ ukui-session/ukuismclient.h | 2 +-
+ ukui-session/ukuismserver.h | 7 ++++---
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
+index eb5686f..a1b82b3 100644
+--- a/tools/mainwindow.cpp
++++ b/tools/mainwindow.cpp
+@@ -105,9 +105,9 @@ QString getUserName(QFile *a)
+ }
+ 
+ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
++                                                        , timer(new QTimer())
+                                                         , ui(new Ui::MainWindow)
+                                                         , m_power(new UkuiPower(this))
+-                                                        , timer(new QTimer())
+                                                         , xEventMonitor(new XEventMonitor(this))
+ {
+     const QByteArray bid(BACKGROUND_SETTINGS);
+diff --git a/ukui-session/ukuismclient.h b/ukui-session/ukuismclient.h
+index dd9eab4..9b9469d 100644
+--- a/ukui-session/ukuismclient.h
++++ b/ukui-session/ukuismclient.h
+@@ -60,8 +60,8 @@ public:
+     bool m_wasPhase2;
+ 
+ private:
+-    const char *m_id;
+     SmsConn m_smsConn;
++    const char *m_id;
+ };
+ 
+ #endif // UKUISMCLIENT_H
+diff --git a/ukui-session/ukuismserver.h b/ukui-session/ukuismserver.h
+index 84d679c..843d67c 100644
+--- a/ukui-session/ukuismserver.h
++++ b/ukui-session/ukuismserver.h
+@@ -121,27 +121,28 @@ private:
+         LaunchingWM, Restoring,
+         Shutdown, Killing, KillingWM, WaitingForKNotify, // shutdown
+     };
++
++    OrgKdeKWinSessionInterface *m_kwinInterface;
+     State m_state;
+ 
+     bool clean;
+     bool m_saveSession;
+     int m_wmPhase1WaitingCount;
++    UKUISMClient *m_clientInteracting;
+     int m_appsToStart;
+     int m_appRestored;
+     int m_saveType;
+ 
+     KProcess *m_wmProcess;
+-    OrgKdeKWinSessionInterface *m_kwinInterface;
+-    UKUISMClient *m_clientInteracting;
+ 
+     QList<QStringList> m_wmStartCommands;
+     QList<UKUISMListener*> m_listener;
+     QList<UKUISMClient*> m_clients;
+     QTimer m_restoreTimer;
+     QTimer m_protectionTimer;
+-    QString m_wm;
+     QString m_lastIdRestore;
+     QString m_sessionGroup;
++    QString m_wm;
+     QStringList m_wmCommands;
+ 
+     QTimer m_systemdLogoutTimer;
+-- 
+2.43.0
+

add-switchuser-no-limits-ukui-session.patch

@@ -0,0 +1,25 @@
+From 875737c14d243792680c8ed2349cb73a9eadc197 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 4 Sep 2023 18:16:05 +0800
+Subject: [PATCH] add switchuser no limits
+
+---
+ tools/mainwindow.cpp | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
+index e077574..0f65f27 100644
+--- a/tools/mainwindow.cpp
++++ b/tools/mainwindow.cpp
+@@ -225,7 +226,7 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
+         hideNum--;
+     }
+ 
+-    if (LockChecker::getCachedUsers() > 1 && m_power->canAction(UkuiPower::PowerSwitchUser)) {
++    if (m_power->canAction(UkuiPower::PowerSwitchUser)) {
+         isSwitchuserHide = false;
+         hideNum--;
+     }
+-- 
+2.33.0
+

remove-ukui-settings-daemon-quit.patch

@@ -0,0 +1,25 @@
+From e23d4ade35fd6e9b8ebdfc57f253d185ec3e9abc Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 21 Sep 2023 10:29:35 +0800
+Subject: [PATCH] remove ukui-settings-daemon
+
+---
+ ukui-session/ukuismserver.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ukui-session/ukuismserver.cpp b/ukui-session/ukuismserver.cpp
+index 0d0df9c..14d9026 100644
+--- a/ukui-session/ukuismserver.cpp
++++ b/ukui-session/ukuismserver.cpp
+@@ -1381,6 +1381,8 @@ void UKUISMServer::changeClientOrder()
+         } else if (programName == QLatin1String("ukui-menu")) {
+             m_clients.removeAll(c);
+             m_clients.append(c);
++        } else if (programName == QLatin1String("ukui-settings-daemon")) {
++            m_clients.removeAll(c);
+         }
+     }
+ }
+-- 
+2.25.1
+

ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch

@@ -0,0 +1,57 @@
+diff -Naur ukui-session-manager-3.1.0/ukui-session/ukuismserver.cpp ukui-session-manager-3.1.0~/ukui-session/ukuismserver.cpp
+--- ukui-session-manager-3.1.0/ukui-session/ukuismserver.cpp	2022-04-20 17:40:57.000000000 +0800
++++ ukui-session-manager-3.1.0~/ukui-session/ukuismserver.cpp	2023-07-09 13:49:42.930414204 +0800
+@@ -1065,22 +1065,28 @@
+ 
+ void UKUISMServer::completeKilling()
+ {
++//     if (m_state == Killing) {
++//         //这一段的含义是只要客户端列表中还有非窗管的客户端存在，则等待，直到客户端中只有一个窗管，则开始杀死窗管
++//         bool wait = false;
++//         foreach (UKUISMClient *c, m_clients) {
++//             if (isWM(c)) {
++//                 continue;
++//             }
++//             wait = true;
++//         }
++
++//         if (wait) {
++//             return;
++//         }
++
++// //        killWM();
++//         //修改为不杀死窗管，直接结束会话
++//         killingCompleted();
++//     }
++// dy use default kde method
+     if (m_state == Killing) {
+-        //这一段的含义是只要客户端列表中还有非窗管的客户端存在，则等待，直到客户端中只有一个窗管，则开始杀死窗管
+-        bool wait = false;
+-        foreach (UKUISMClient *c, m_clients) {
+-            if (isWM(c)) {
+-                continue;
+-            }
+-            wait = true;
+-        }
+-
+-        if (wait) {
++        if (!m_clients.isEmpty()) // still waiting for clients to go away
+             return;
+-        }
+-
+-//        killWM();
+-        //修改为不杀死窗管，直接结束会话
+         killingCompleted();
+     }
+ }
+@@ -1145,7 +1151,9 @@
+ void UKUISMServer::killingCompleted()
+ {
+     emit logoutFinished();
+-//    qApp->quit();
++    //dy use default kde method
++    qApp->quit();
++    return;
+     //目前不清楚如果不做清理会有什么影响，看日志没有发现问题，使用上也没有区别，但为了保险还是加上
+     cleanUp();
+ 

ukui-session-manager.spec

@@ -1,11 +1,14 @@
 Name:           ukui-session-manager
 Version:        3.1.0
-Release:        2
+Release:        7
 Summary:        Session manager of the UKUI desktop environment
 License:        GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later 
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-
+Patch02:        ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch 
+Patch03:        add-switchuser-no-limits-ukui-session.patch
+Patch05:        remove-ukui-settings-daemon-quit.patch
+Patch06:	0001-fix-initialization-order-problem-of-class-members.patch
 
 BuildRequires:  cmake
 BuildRequires:  libX11-devel
@@ -48,6 +51,10 @@ Provides: x-session-manager
 
 %prep
 %setup -q
+%patch 2 -p1
+%patch 3 -p1
+%patch 5 -p1
+%patch 6 -p1
 
 %build
 mkdir cmake-build
@@ -75,10 +82,36 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/*
 %{_prefix}/bin/ukui-session
 %{_prefix}/bin/ukui-session-tools
-%{_datadir}/man/man1/ukui-session.1.gz
-%{_datadir}/man/man1/ukui-session-tools.1.gz
 
 %changelog
+* Tue Apr 30 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.0-7
+- fix class member initialization order problems
+
+* Thu Sep 21 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-6
+- Type:bugfix
+- ID  :NA
+- SUG :NA
+- DESC:add patch5: remove-ukui-settings-daemon-quit.patch
+
+* Mon Sep 04 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-5
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add patch3:add-switchuser-no-limits-ukui-session.patch
+       rm disable-Suspend-and-Sleep-of-ukui-session-manager.patch
+
+* Mon Jul 10 2023 huayadong <huayadong@kylinos.cn> - 3.1.0-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add patch2:ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch
+
+* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: disable Suspend and Sleep of ukui-session-manager
+
 * Tue Feb 07 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.0-2
 - Enable debuginfo for fix strip