!29 [sync] PR-28: Allow root user to use desktop manager

Merge pull request !29 from openeuler-sync-bot/sync-pr28-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3

0001-allow-root-to-use-desktop-manager.patch

@@ -0,0 +1,26 @@
+From b081e9b4b21113e74e497df6d8ca92b2a41f16bc Mon Sep 17 00:00:00 2001
+From: tangjie02 <tangjie02@kylinsec.com.cn>
+Date: Mon, 13 Dec 2021 14:06:04 +0800
+Subject: [PATCH] allow root to use desktop manager
+
+Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
+---
+ src/caja-application.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/caja-application.c b/src/caja-application.c
+index 090c3dd..d8c7acd 100644
+--- a/src/caja-application.c
++++ b/src/caja-application.c
+@@ -2293,7 +2293,7 @@ init_desktop (CajaApplication *self)
+         self->priv->no_desktop = TRUE;
+     }
+ 
+-    if (running_as_root () || !running_in_mate ())
++    if (!running_in_mate ())
+ 	{
+         /* do not manage desktop when running as root or on other desktops unless forced */
+         self->priv->no_desktop = TRUE;
+-- 
+2.27.0
+

caja.spec

@@ -16,9 +16,9 @@ Name:        caja
 Summary:     File manager for MATE
 Version:     %{branch}.2
 %if 0%{?rel_build}
-Release:     7
+Release:     8
 %else
-Release:     0.12%{?git_rel}%{?dist}
+Release:     0.13%{?git_rel}%{?dist}
 %endif
 License:     GPLv2+ and LGPLv2+
 URL:         http://mate-desktop.org
@@ -41,6 +41,8 @@ Patch5:      caja-1.22.2-mate-search-tool.patch
 
 Patch6:      caja-1.22.2-trash-translate.patch
 
+Patch7:      0001-allow-root-to-use-desktop-manager.patch
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  exempi-devel
@@ -196,6 +198,9 @@ EOF
 
 
 %changelog
+* Mon Dec 13 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-8
+- Allow root user to use desktop manager
+
 * Fri Dec 10 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-7
 - Modify the require isoft-menus to openEuler-menus