packages/caja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!48 修复在桌面右键的菜单栏里点击”更改桌面背景“无反应

Browse Source 
From: @wangxiaoqing987 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-07-29 02:23:23 +00:00 committed by Gitee
commit 3fc85c7393
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 90 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
0001-Support-change-desktop-background-image-in-kiran-des.patch Normal file
View File

@ -0,0 +1,85 @@
From b8c487050e04975cb81bd9404f4f4281b6ed6f86 Mon Sep 17 00:00:00 2001
From: wangxiaoqing <wangxiaoqing@kylinsec.com.cn>
Date: Wed, 27 Jul 2022 14:14:11 +0800
Subject: [PATCH] Support change desktop background image in kiran desktop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复在Kiran桌面中桌面右键更改桌面背景菜单无法使用的问题
Related #I5I1HE
Signed-off-by: wangxiaoqing <wangxiaoqing@kylinsec.com.cn>
---
libcaja-private/caja-program-choosing.c | 5 ++++
src/file-manager/fm-desktop-icon-view.c | 32 +++++++++++++++++++++----
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/libcaja-private/caja-program-choosing.c b/libcaja-private/caja-program-choosing.c
index 5e3d22b..033142d 100644
--- a/libcaja-private/caja-program-choosing.c
+++ b/libcaja-private/caja-program-choosing.c
@@ -358,6 +358,11 @@ caja_launch_application_from_command (GdkScreen *screen,
display = gdk_screen_get_display (screen);
launch_context = gdk_display_get_app_launch_context (display);
gdk_app_launch_context_set_screen (launch_context, screen);
+ /**
+ * Remove GIO_LAUNCHED_DESKTOP_FILE Environment variables to allow
+ * the KIRAN taskbar to find the corresponding window icon.
+ */
+ g_app_launch_context_unsetenv (G_APP_LAUNCH_CONTEXT (launch_context), "GIO_LAUNCHED_DESKTOP_FILE");
g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (launch_context), NULL);
g_object_unref (launch_context);
g_object_unref (app_info);
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index aa40b2d..22dfa3f 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -656,17 +656,39 @@ action_new_launcher_callback (GtkAction *action, gpointer data)
}
+static gboolean
+running_in_kiran (void)
+{
+ return (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "KIRAN") == 0)
+ || (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "KIRAN") == 0)
+ || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "KIRAN") == 0);
+}
+
static void
action_change_background_callback (GtkAction *action,
gpointer data)
{
g_assert (FM_DIRECTORY_VIEW (data));
- caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
- _("Background"),
- "mate-appearance-properties",
- FALSE,
- "--show-page=background", NULL);
+ if (running_in_kiran())
+ {
+ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
+ _("Background"),
+ "kiran-control-panel",
+ FALSE,
+ "-c",
+ "individuation",
+ "-s",
+ "Wallpaper", NULL);
+ }
+ else
+ {
+ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
+ _("Background"),
+ "mate-appearance-properties",
+ FALSE,
+ "--show-page=background", NULL);
+ }
}
static void
--
2.36.1

6
caja.spec
View File

@ -16,7 +16,7 @@ Name: caja
Summary: File manager for MATE
Version: %{branch}.1
%if 0%{?rel_build}
Release: 6
Release: 7
%else
Release: 0.15%{?git_rel}
%endif
@ -33,6 +33,7 @@ Patch0: caja_add-xfce-to-desktop-file-1.25.patch
Patch1: 0001-allow-root-to-use-desktop-manager.patch
Patch2: 0002-feature-kiran-Support-kiran-desktop-environment.patch
Patch3: 0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch
Patch4: 0001-Support-change-desktop-background-image-in-kiran-des.patch
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
@ -184,6 +185,9 @@ EOF
%changelog
* Wed Jul 27 2022 wangxiaoqing <wangxiaoqing@kylinsec.com.cn> - 1.24.1-7
- Support change desktop background image in kiran desktop
* Thu Jun 23 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 1.24.1-6
- Remove %{?dist}