!44 [sync] PR-41: add 0002-fix-userinfo-error-in-sidebar.patch
From: @openeuler-sync-bot Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
93baf83813
33
0002-fix-userinfo-error-in-sidebar.patch
Normal file
33
0002-fix-userinfo-error-in-sidebar.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 77cd96038f9ba86e48e9aa43222903887517d7a9 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Fri, 30 Jun 2023 17:41:11 +0800
|
||||
Subject: [PATCH] fix userinfo error in sidebar
|
||||
|
||||
---
|
||||
.../ukui-quick-operation-panel/accountinformation.cpp | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugins/ukui-quick-operation-panel/accountinformation.cpp b/src/plugins/ukui-quick-operation-panel/accountinformation.cpp
|
||||
index 6adfa5f..778b5e7 100644
|
||||
--- a/src/plugins/ukui-quick-operation-panel/accountinformation.cpp
|
||||
+++ b/src/plugins/ukui-quick-operation-panel/accountinformation.cpp
|
||||
@@ -71,8 +71,15 @@ QStringList AccountInformation::getUserObjectPath()
|
||||
QStringList users;
|
||||
QDBusReply<QList<QDBusObjectPath> > reply = m_pSystemUserIface->call("ListCachedUsers");
|
||||
if (reply.isValid()) {
|
||||
- for (QDBusObjectPath op : reply.value())
|
||||
+ bool currentflag = false;
|
||||
+ QString currentpath = "/org/freedesktop/Accounts/User" + QString::number(getuid());
|
||||
+ for (QDBusObjectPath op : reply.value()){
|
||||
users << op.path();
|
||||
+ if(!op.path().compare(currentpath, Qt::CaseSensitive))
|
||||
+ currentflag=true;
|
||||
+ }
|
||||
+ if(!currentflag)
|
||||
+ users << currentpath;
|
||||
}
|
||||
return users;
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
Name: ukui-sidebar
|
||||
Version: 3.3.0
|
||||
Release: 4
|
||||
Release: 5
|
||||
Summary: parallels toolbox for UKUI
|
||||
License: GPL-3+
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch01: 0001-fix-get-Weather-error.patch
|
||||
|
||||
Patch02: 0002-fix-userinfo-error-in-sidebar.patch
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qtsvg-devel
|
||||
@ -30,6 +30,7 @@ BuildRequires: ukui-interface
|
||||
%prep
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
|
||||
%build
|
||||
mkdir build && cd build
|
||||
@ -73,6 +74,12 @@ done
|
||||
%{_datadir}/glib-2.0/schemas/
|
||||
|
||||
%changelog
|
||||
* Fri Jun 30 2023 peijiankang <peijiankang@kylinos.cn> - 3.3.0-5
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add 0002-fix-userinfo-error-in-sidebar.patch
|
||||
|
||||
* Sat Jun 17 2023 huayadong <huayadong@kylinos.cn> - 3.3.0-4
|
||||
- remove Recommends: ukui-notebook ukylin-feedback-client ukui-clock
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user