don't use comma to concatenate pam messages when not need to

Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
(cherry picked from commit f02fafce3aae2199afa714f0d5c4d65056cca2d2)

0001-ukui-greeter-don-t-add-redundant-comma.patch

@@ -0,0 +1,34 @@
+From 680e62a11e8591f5681008869ecef7614b07d7ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
+Date: Mon, 22 Apr 2024 09:49:50 +0800
+Subject: [PATCH] ukui-greeter: don't add redundant comma
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+when not need to
+
+Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
+---
+ ukui-greeter/greeter/loginwindow.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp
+index 4ab27b7..c6b2dd5 100644
+--- a/ukui-greeter/greeter/loginwindow.cpp
++++ b/ukui-greeter/greeter/loginwindow.cpp
+@@ -757,7 +757,10 @@ void LoginWindow::onShowMessage(QString text, QLightDM::Greeter::MessageType typ
+     unacknowledged_messages = true;
+     if (!m_preStrMessage.isEmpty() && m_preStrMessageType != type && m_preStrMessageType != -1)
+     {
+-        text = m_preStrMessage + "," + text;
++	if (m_preStrMessage.endsWith("。") || m_preStrMessage.endsWith("."))
++            text = m_preStrMessage + text;
++	else
++            text = m_preStrMessage + "," + text;
+     }
+ 
+     qDebug()<<"unacknowledged_messages = true";
+-- 
+2.43.0
+

ukui-greeter.spec

@@ -1,6 +1,6 @@
 Name:           ukui-greeter
 Version:        3.1.2
-Release:        11
+Release:        12
 Summary:        Lightdm greeter for UKUI
 License:        GPL-2.0-or-later
 URL:            http://www.ukui.org
@@ -14,6 +14,7 @@ Patch05:        disable-Suspend-and-Sleep-of-ukui-greeter.patch
 %endif
 Patch06:        translation-error-about-Login.patch
 Patch07:        fix-date-and-nm-of-greeter.patch
+Patch08:	0001-ukui-greeter-don-t-add-redundant-comma.patch
 BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers opencv glib2-devel
 BuildRequires: gsettings-qt-devel
 Requires: pkgconf
@@ -48,6 +49,7 @@ fi
 %endif
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 %{qmake_qt5}
@@ -75,6 +77,9 @@ gzip  -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
 /usr/lib/ukui-greeter/ukui-greeter-nm-start.sh
 
 %changelog
+* Mon Apr 22 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.2-12
+- don't use comma to concatenate pam messages when not need to
+
 * Mon Jul 10 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-11
 - Type:Bugfix
 - ID:NA