diff --git a/0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch b/0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch deleted file mode 100644 index 06bbc0f1b626588ccea6db723f5271b7520e765e..0000000000000000000000000000000000000000 --- a/0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b36d0047bc7012b387abf775d25078b4195b83e5 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Wed, 27 Jul 2022 17:49:59 +0800 -Subject: [PATCH 1/4] Fix the file can be rename to only container space name - file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复重命名文件和文件夹时只输入空格，文件命名成了空文件名 - Related #I5I8KI - -Signed-off-by: wangxiaoqing ---- - libcaja-private/caja-icon-container.c | 4 +++- - src/file-manager/fm-list-view.c | 5 ++++- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c -index 5de4ac3..9a2c3e8 100644 ---- a/libcaja-private/caja-icon-container.c -+++ b/libcaja-private/caja-icon-container.c -@@ -9132,7 +9132,9 @@ end_renaming_mode (CajaIconContainer *container, gboolean commit) - - /* Verify that text has been modified before signalling change. */ - changed_text = eel_editable_label_get_text (EEL_EDITABLE_LABEL (container->details->rename_widget)); -- if (strcmp (container->details->original_text, changed_text) != 0) -+ if (strlen (changed_text) > 0 && -+ strcmp (container->details->original_text, changed_text) != 0 && -+ strncmp (changed_text, " ", 1) != 0) - { - AtkObject *accessible_icon; - -diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c -index bfc29c2..6339a1c 100644 ---- a/src/file-manager/fm-list-view.c -+++ b/src/file-manager/fm-list-view.c -@@ -1402,7 +1402,10 @@ cell_renderer_edited (GtkCellRendererText *cell, - -1); - - /* Only rename if name actually changed */ -- if (strcmp (new_text, view->details->original_name) != 0) -+ if (strlen (new_text) > 0 && -+ strcmp (new_text, view->details->original_name) != 0 && -+ strncmp (new_text, " ", 1) != 0) -+ - { - view->details->renaming_file = caja_file_ref (file); - view->details->rename_done = FALSE; --- -2.36.1 - diff --git a/0001-Fix-the-file-rename-error-msg-too-long.patch b/0001-Fix-the-file-rename-error-msg-too-long.patch deleted file mode 100644 index 02b1b8962f23ea52dd02db6c16e902f38420e30e..0000000000000000000000000000000000000000 --- a/0001-Fix-the-file-rename-error-msg-too-long.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a563dba2c4a920b8caae1a3cef9e87168327c9bf Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Wed, 27 Jul 2022 17:33:08 +0800 -Subject: [PATCH 1/4] Fix the file rename error msg too long -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复文件重命名失败时，错误消息窗口太长的问题 - Related #I5I8IM - -Signed-off-by: wangxiaoqing ---- - po/caja.pot | 4 ++++ - po/zh_CN.po | 3 +++ - src/file-manager/fm-error-reporting.c | 4 ++++ - 3 files changed, 11 insertions(+) - -diff --git a/po/caja.pot b/po/caja.pot -index 2eb694e..33f556a 100644 ---- a/po/caja.pot -+++ b/po/caja.pot -@@ -7503,3 +7503,7 @@ msgstr "" - #: src/file-manager/fm-widget-view.c:447 - msgid "Display this location with the widget view." - msgstr "" -+ -+#: src/file-manager/fm-error-reporting.c:148 -+msgid "File name too long. Please use a different name." -+msgstr "" -diff --git a/po/zh_CN.po b/po/zh_CN.po -index cbaf91e..5a70ffe 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -7607,3 +7607,6 @@ msgstr "用部件视图来展示该位置。" - - #~ msgid "network-workgroup" - #~ msgstr "network-workgroup" -+#: src/file-manager/fm-error-reporting.c:148 -+msgid "File name too long. Please use a different name." -+msgstr "文件名称太长。请使用另外的名字。" -diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c -index 93cf77f..4a9b515 100644 ---- a/src/file-manager/fm-error-reporting.c -+++ b/src/file-manager/fm-error-reporting.c -@@ -144,6 +144,10 @@ fm_report_error_renaming_file (CajaFile *file, - new_name_truncated); - } - break; -+ case G_IO_ERROR_FILENAME_TOO_LONG: -+ message = g_strdup_printf (_("File name too long. " -+ "Please use a different name.")); -+ break; - default: - break; - } --- -2.36.1 - diff --git a/0001-Support-change-desktop-background-image-in-kiran-des.patch b/0001-Support-change-desktop-background-image-in-kiran-des.patch deleted file mode 100644 index f8f2f031e99dcd601efc5a1efafc105fd33c6986..0000000000000000000000000000000000000000 --- a/0001-Support-change-desktop-background-image-in-kiran-des.patch +++ /dev/null @@ -1,85 +0,0 @@ -From b8c487050e04975cb81bd9404f4f4281b6ed6f86 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -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 ---- - 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 - diff --git a/0001-allow-root-to-use-desktop-manager.patch b/0001-allow-root-to-use-desktop-manager.patch deleted file mode 100644 index 1f03d6d60df77041f2fa068010f97ec7f3d1d117..0000000000000000000000000000000000000000 --- a/0001-allow-root-to-use-desktop-manager.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b081e9b4b21113e74e497df6d8ca92b2a41f16bc Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Mon, 13 Dec 2021 14:06:04 +0800 -Subject: [PATCH] allow root to use desktop manager - -Signed-off-by: tangjie02 ---- - 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 - diff --git a/0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch b/0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch deleted file mode 100644 index 8768891415c7243b7115092ff75f26e9c4a87a03..0000000000000000000000000000000000000000 --- a/0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2e401e51b4a4755bd77932b4a13e82c834905fc8 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Fri, 2 Sep 2022 09:40:03 +0800 -Subject: [PATCH] fix(desktop): Add Chinese name translation to desktop files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 给桌面文件添加中文名称翻译, 使得面板上图标的提示语为文件管理器 - -Signed-off-by: wangxiaoqing ---- - data/caja.desktop.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/caja.desktop.in b/data/caja.desktop.in -index 3d8a122..b1fb931 100644 ---- a/data/caja.desktop.in -+++ b/data/caja.desktop.in -@@ -1,5 +1,6 @@ - [Desktop Entry] - Name=Caja -+Name[zh_CN]=文件管理器 - GenericName[af]=Lêerbestuurder - GenericName[am]=የ ፋይል አስተዳዳሪ - GenericName[ar]=مدير الملفات --- -2.36.1 - diff --git a/0002-Let-the-location-bar-background-change-with-theme.patch b/0002-Let-the-location-bar-background-change-with-theme.patch deleted file mode 100644 index e2964e85a26a3be97696fe6f00a70e85a2356806..0000000000000000000000000000000000000000 --- a/0002-Let-the-location-bar-background-change-with-theme.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f8df64351263ced3b369a03b93ac2a1644f56678 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Thu, 28 Jul 2022 08:57:36 +0800 -Subject: [PATCH 2/4] Let the location bar background change with theme -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 让位置栏背景和主题一起变化， 修复切换为浅色主题后文件管理器位置栏仍为黑色 - Related #I5I8V9 - -Signed-off-by: wangxiaoqing ---- - src/caja-navigation-window-pane.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c -index 29018b5..019162c 100644 ---- a/src/caja-navigation-window-pane.c -+++ b/src/caja-navigation-window-pane.c -@@ -58,9 +58,6 @@ real_set_active (CajaWindowPane *pane, gboolean is_active) - gtk_widget_set_sensitive (gtk_bin_get_child (GTK_BIN (caja_path_bar_get_button_from_button_list_entry (l->data))), is_active); - } - -- /* navigation bar (manual entry) */ -- caja_location_bar_set_active (CAJA_LOCATION_BAR (nav_pane->navigation_bar), is_active); -- - /* location button */ - gtk_widget_set_sensitive (gtk_bin_get_child (GTK_BIN (nav_pane->location_button)), is_active); - } --- -2.36.1 - diff --git a/0002-feature-kiran-Support-kiran-desktop-environment.patch b/0002-feature-kiran-Support-kiran-desktop-environment.patch deleted file mode 100644 index 367d81256eb438a0ddbe7646c53d7db27fa28330..0000000000000000000000000000000000000000 --- a/0002-feature-kiran-Support-kiran-desktop-environment.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 91dcb951c19e7a05b16f81474e0708e2389ce1d3 Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Mon, 9 Aug 2021 18:00:34 +0800 -Subject: [PATCH 2/3] feature(kiran): Support kiran desktop environment. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 支持kiran桌面环境 - -Signed-off-by: tangjie02 ---- - libegg/eggsmclient.c | 10 +++++++++- - src/caja-application.c | 11 +++++++++-- - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/libegg/eggsmclient.c b/libegg/eggsmclient.c -index c404349..3113e6b 100644 ---- a/libegg/eggsmclient.c -+++ b/libegg/eggsmclient.c -@@ -59,6 +59,14 @@ running_in_mate (void) - || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0); - } - -+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 - egg_sm_client_init (EggSMClient *client) - { -@@ -360,7 +368,7 @@ egg_sm_client_get (void) - as egg_sm_client_set_mode must be called prior to start of main loop - to stop caja restart but this is diffcult in GtkApplication */ - -- if (geteuid () == 0 || !running_in_mate ()){ -+ if (geteuid () == 0 || !(running_in_mate () || running_in_kiran ())){ - global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); - } - } -diff --git a/src/caja-application.c b/src/caja-application.c -index 2791bd9..8d33baa 100644 ---- a/src/caja-application.c -+++ b/src/caja-application.c -@@ -1838,6 +1838,13 @@ running_in_mate (void) - || (g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate") == 0); - } - -+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 gboolean - running_as_root (void) - { -@@ -2110,7 +2117,7 @@ init_desktop (CajaApplication *self) - self->priv->no_desktop = TRUE; - } - -- if (!running_in_mate ()) -+ if (!running_in_mate () && !running_in_kiran ()) - { - /* do not manage desktop when running as root or on other desktops unless forced */ - self->priv->no_desktop = TRUE; -@@ -2262,7 +2269,7 @@ caja_application_startup (GApplication *app) - * Otherwise, we read the value from the configuration. - */ - -- if (running_in_mate () && !running_as_root()) -+ if ((running_in_mate () || running_in_kiran ()) && !running_as_root()) - { - GApplication *instance; - --- -2.33.0 - diff --git a/0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch b/0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch deleted file mode 100644 index 6f856b6c1adffe96a3c5e6d651a63ef3a9388319..0000000000000000000000000000000000000000 --- a/0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 84bd5f2ea9d84094b5a2b0cba2eab9b8c3116c53 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Thu, 28 Jul 2022 14:00:58 +0800 -Subject: [PATCH 3/4] Fix the background image can not draw all when rotating - screen -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复旋转屏幕90°时，一半屏幕无法正常显示 - Related #I5I2U6 - -Signed-off-by: wangxiaoqing ---- - src/caja-desktop-window.c | 37 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 35 insertions(+), 2 deletions(-) - -diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c -index 36ae52c..97b5a0b 100644 ---- a/src/caja-desktop-window.c -+++ b/src/caja-desktop-window.c -@@ -148,17 +148,50 @@ caja_desktop_window_update_directory (CajaDesktopWindow *window) - g_object_unref (location); - } - -+static void -+calculate_screen_size (GdkScreen *screen, -+ int *width, -+ int *height) -+{ -+ GdkDisplay *display; -+ gint monitors; -+ gint i, x1, y1, x2, y2; -+ -+ display = gdk_screen_get_display (screen); -+ monitors = gdk_display_get_n_monitors (display); -+ -+ x1 = y1 = G_MAXINT; -+ x2 = y2 = G_MININT; -+ -+ for (i = 0; i < monitors; i++) -+ { -+ GdkMonitor *monitor = gdk_display_get_monitor (display, i); -+ GdkRectangle geometry; -+ -+ gdk_monitor_get_geometry (monitor, &geometry); -+ x1 = MIN (x1, geometry.x); -+ y1 = MIN (y1, geometry.y); -+ x2 = MAX (x2, geometry.x + geometry.width); -+ y2 = MAX (y2, geometry.y + geometry.height); -+ } -+ -+ *width = x2 - x1; -+ *height = y2 - y1; -+} -+ - static void - caja_desktop_window_screen_size_changed (GdkScreen *screen, - CajaDesktopWindow *window) - { - int width_request, height_request; - int scale; -+ int screen_width, screen_height; - - scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen)); - -- width_request = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale; -- height_request = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale; -+ calculate_screen_size (screen, &screen_width, &screen_height); -+ width_request = screen_width / scale; -+ height_request = screen_height / scale; - - g_object_set (window, - "width_request", width_request, --- -2.36.1 - diff --git a/0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch b/0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch deleted file mode 100644 index f238bf1e4491130c9f2c017fd1d434e9fcd4e6fe..0000000000000000000000000000000000000000 --- a/0003-fix-libegg-caja-not-register-for-root-in-MATE-deskto.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0b2176a539338466dda802b06fcd7589d51ceef5 Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Thu, 7 May 2020 00:06:50 +0800 -Subject: [PATCH 3/3] fix(libegg): caja not register for root in MATE desktop - before session manager timeout -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复caja在root登录时未向mate-session-manager进行注册导致mate-session-manager长时间等待(30秒)的问题 - -Signed-off-by: tangjie02 ---- - libegg/eggsmclient.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libegg/eggsmclient.c b/libegg/eggsmclient.c -index 3113e6b..f8c35e1 100644 ---- a/libegg/eggsmclient.c -+++ b/libegg/eggsmclient.c -@@ -368,7 +368,7 @@ egg_sm_client_get (void) - as egg_sm_client_set_mode must be called prior to start of main loop - to stop caja restart but this is diffcult in GtkApplication */ - -- if (geteuid () == 0 || !(running_in_mate () || running_in_kiran ())){ -+ if (!(running_in_mate () || running_in_kiran ())){ - global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); - } - } --- -2.33.0 - diff --git a/0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch b/0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch deleted file mode 100644 index ef4cbce6f218a1cff5c730144e8b1e2de15abbb3..0000000000000000000000000000000000000000 --- a/0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5b3b8728e06b515c9ab3cdd2d601445cabd285a8 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Fri, 29 Jul 2022 16:41:14 +0800 -Subject: [PATCH 4/4] Not draw icon and text hight light color when icon not - get force -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 当图标未获得焦点时，不高亮绘制其图标和文字 - Related #I5HRI0 - -Signed-off-by: wangxiaoqing ---- - libcaja-private/caja-icon-canvas-item.c | 25 ++++++++++++------------- - 1 file changed, 12 insertions(+), 13 deletions(-) - -diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c -index 7ab2f70..7c56de2 100644 ---- a/libcaja-private/caja-icon-canvas-item.c -+++ b/libcaja-private/caja-icon-canvas-item.c -@@ -1077,7 +1077,9 @@ prepare_pango_layout_for_draw (CajaIconCanvasItem *item, - container = CAJA_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas); - details = item->details; - -- needs_highlight = details->is_highlighted_for_selection || details->is_highlighted_for_drop; -+ needs_highlight = (details->is_highlighted_for_selection && -+ gtk_widget_has_focus (GTK_WIDGET (EEL_CANVAS_ITEM (item)->canvas))) || -+ details->is_highlighted_for_drop; - - if (IS_COMPACT_VIEW (container)) - { -@@ -1278,7 +1280,9 @@ draw_label_text (CajaIconCanvasItem *item, - - text_rect = compute_text_rectangle (item, icon_rect, TRUE, BOUNDS_USAGE_FOR_DISPLAY); - -- needs_highlight = details->is_highlighted_for_selection || details->is_highlighted_for_drop; -+ needs_highlight = (details->is_highlighted_for_selection && -+ gtk_widget_has_focus (GTK_WIDGET (EEL_CANVAS_ITEM (item)->canvas))) || -+ details->is_highlighted_for_drop; - is_rtl_label_beside = caja_icon_container_is_layout_rtl (container) && - container->details->label_position == CAJA_ICON_LABEL_POSITION_BESIDE; - -@@ -1777,22 +1781,17 @@ real_map_surface (CajaIconCanvasItem *icon_item) - } - } - -- if (icon_item->details->is_highlighted_for_selection -- || icon_item->details->is_highlighted_for_drop) -+ if ((icon_item->details->is_highlighted_for_selection && -+ gtk_widget_has_focus (GTK_WIDGET (canvas))) || -+ icon_item->details->is_highlighted_for_drop) - { - GtkStyleContext *style; - - style = gtk_widget_get_style_context (GTK_WIDGET (canvas)); - -- if (gtk_widget_has_focus (GTK_WIDGET (canvas))) { -- gtk_style_context_get (style, GTK_STATE_FLAG_SELECTED, -- GTK_STYLE_PROPERTY_BACKGROUND_COLOR, -- &c, NULL); -- } else { -- gtk_style_context_get (style, GTK_STATE_FLAG_ACTIVE, -- GTK_STYLE_PROPERTY_BACKGROUND_COLOR, -- &c, NULL); -- } -+ gtk_style_context_get (style, GTK_STATE_FLAG_SELECTED, -+ GTK_STYLE_PROPERTY_BACKGROUND_COLOR, -+ &c, NULL); - - color = *c; - gdk_rgba_free (c); --- -2.36.1 - diff --git a/1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch b/1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch deleted file mode 100644 index 5dc41cd414547b13cf7255905a48e773f486e954..0000000000000000000000000000000000000000 --- a/1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 29a720a6c6abcf2ab3afeabcc5effef425845e1c Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Wed, 12 Jan 2022 08:56:02 +0600 -Subject: [PATCH 1084/1085] fix(caja): Fix the open terminal can not correct to - terminal icon -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复从文件管理器打开终端时，图标无法对应上的问题 - Related #48474 - -Signed-off-by: wangxiaoqing ---- - src/caja-main.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/caja-main.c b/src/caja-main.c -index 1fa77c2..1eab994 100644 ---- a/src/caja-main.c -+++ b/src/caja-main.c -@@ -251,6 +251,8 @@ main (int argc, char *argv[]) - mallopt (M_MMAP_THRESHOLD, 128 *1024); - #endif - -+ g_unsetenv("GIO_LAUNCHED_DESKTOP_FILE"); -+ - if (g_getenv ("CAJA_DEBUG") != NULL) { - eel_make_warnings_and_criticals_stop_in_debugger (); - } --- -2.27.0 - diff --git a/Enable-showing-in-Budgie-Desktop-and-XFCE.patch b/Enable-showing-in-Budgie-Desktop-and-XFCE.patch new file mode 100644 index 0000000000000000000000000000000000000000..de2a571a76f95da3abde269dd7b0a2a22ff8ca9a --- /dev/null +++ b/Enable-showing-in-Budgie-Desktop-and-XFCE.patch @@ -0,0 +1,23 @@ +From 4032ab68f53d2b5e8337121d6b81b611af6d3b90 Mon Sep 17 00:00:00 2001 +From: Joshua Strobl +Date: Sun, 11 Dec 2022 15:46:20 +0200 +Subject: [PATCH 1/1] Enable showing in Budgie Desktop and XFCE + +This PR enables the displaying of Caja (as a file manager) for use in Budgie Desktop and XFCE. Prior to this commit, it would only be able accessible in MATE or with downstreams like Fedora patching in the support. The addition of these is important as file managers such as Nautilus adopt libadwaita and begin to directly come into conflict with user theming choices. +--- + data/caja-browser.desktop.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/caja-browser.desktop.in.in b/data/caja-browser.desktop.in.in +index 4578be1..8d45134 100644 +--- a/data/caja-browser.desktop.in.in ++++ b/data/caja-browser.desktop.in.in +@@ -12,4 +12,4 @@ Type=Application + Categories=GTK;System;Core; + # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! + Keywords=files;browser;manager;MATE; +-OnlyShowIn=MATE; ++OnlyShowIn=Budgie;MATE;XFCE; +-- +2.38.1 + diff --git a/caja-1.24.1.tar.xz b/caja-1.24.1.tar.xz deleted file mode 100755 index c6021fa5fd30adb09e336bb022cd3181ed496570..0000000000000000000000000000000000000000 Binary files a/caja-1.24.1.tar.xz and /dev/null differ diff --git a/caja-1.24.1-2.isoft.src.rpm b/caja-1.26.1.tar.xz old mode 100755 new mode 100644 similarity index 41% rename from caja-1.24.1-2.isoft.src.rpm rename to caja-1.26.1.tar.xz index 42cbf9cd8aa0689af7308e97b379570fd33a0556..f86526b95d7d756f17c850a70a603d7ea182f25a Binary files a/caja-1.24.1-2.isoft.src.rpm and b/caja-1.26.1.tar.xz differ diff --git a/caja.spec b/caja.spec old mode 100755 new mode 100644 index bcfa40dce4b79d4cb8e5bb6c10279a44fa61cb6a..42c754dd390b3e53e117d79a813a8432bbd78502 --- a/caja.spec +++ b/caja.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.24 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit ee0a62c8759040d84055425954de1f860bac8652} @@ -15,11 +15,7 @@ Name: caja Summary: File manager for MATE Version: %{branch}.1 -%if 0%{?rel_build} -Release: 12 -%else -Release: 0.15%{?git_rel} -%endif +Release: 1 License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -29,18 +25,7 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -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 -Patch5: 0001-Fix-the-file-rename-error-msg-too-long.patch -Patch6: 0001-Fix-the-file-can-be-rename-to-only-container-space-n.patch -Patch7: 0002-Let-the-location-bar-background-change-with-theme.patch -Patch8: 0003-Fix-the-background-image-can-not-draw-all-when-rotat.patch -Patch9: 0004-Not-draw-icon-and-text-hight-light-color-when-icon-n.patch -Patch10: 0001-fix-desktop-Add-Chinese-name-translation-to-desktop-.patch -Patch11: 1084-fix-caja-Fix-the-open-terminal-can-not-correct-to-te-29a720a6.patch +Patch0: Enable-showing-in-Budgie-Desktop-and-XFCE.patch BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils @@ -192,43 +177,8 @@ EOF %changelog -* Fri Sep 09 2022 liuxinhao - 1.24.1-12 -- Apply the last submitted patch - -* Thu Sep 08 2022 liuxinhao - 1.24.1-11 -- Fix the open terminal can not correct to terminal icon(#I5Q5ME) - -* Fri Sep 02 2022 wangxiaoqing - 1.24.1-10 -- Add Chinese name translation to desktop files - -* Fri Jul 29 2022 wangxiaoqing - 1.24.1-9 -- Fix the file can be rename to only container space name -- Let the location bar background change with theme -- Fix the background image can not draw all when rotating -- Not draw icon and text hight light color when icon not get force - -* Fri Jul 29 2022 wangxiaoqing - 1.24.1-8 -- Fix the file rename error msg too long - -* Wed Jul 27 2022 wangxiaoqing - 1.24.1-7 -- Support change desktop background image in kiran desktop - -* Thu Jun 23 2022 tangjie02 - 1.24.1-6 -- Remove %{?dist} - -* Thu Jun 23 2022 tangjie02 - 1.24.1-5 -- Support kiran desktop environment. -- Caja not register for root in MATE desktop before session manager timeout - -* Thu Mar 24 2022 zhangtao - 1.24.1-4 -- modify else release number back - -* Thu Mar 24 2022 xu_ping - 1.24.1-3 -- Remove %{?dist} - -* Tue Jan 25 2022 longcheng - 1.24.1-2 -- Modify the require redhat-menus to openEuler-menus -- Allow root to use desktop manager +* Mon Aug 26 2024 yueyaoqiang - 1.26.1-1 +- update to 1.26.1 * Thu Mar 25 2021 Wolfgang Ulbrich - 1.24.1-1 - update to 1.24.1 diff --git a/caja_add-xfce-to-desktop-file-1.25.patch b/caja_add-xfce-to-desktop-file-1.25.patch deleted file mode 100755 index 38f34c50988e7e33e74b940fcdda6bc628f78c21..0000000000000000000000000000000000000000 --- a/caja_add-xfce-to-desktop-file-1.25.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uprN caja-1.23.3.orig/data/caja-browser.desktop.in caja-1.23.3/data/caja-browser.desktop.in ---- caja-1.23.3.orig/data/caja-browser.desktop.in 2020-01-19 19:26:14.000000000 +0100 -+++ caja-1.23.3/data/caja-browser.desktop.in 2020-01-19 19:59:55.695171961 +0100 -@@ -218,4 +218,4 @@ Keywords[sl]=datoteke;brskalnik;upravlja - Keywords[zh_CN]=文件;浏览;管理;MATE; - Keywords[zh_TW]=files;browser;manager;MATE; - Keywords=files;browser;manager;MATE; --OnlyShowIn=MATE; -+OnlyShowIn=MATE;XFCE; -diff -uprN caja-1.23.3.orig/data/caja-browser.desktop.in.in caja-1.23.3/data/caja-browser.desktop.in.in ---- caja-1.23.3.orig/data/caja-browser.desktop.in.in 2020-01-10 11:05:05.000000000 +0100 -+++ caja-1.23.3/data/caja-browser.desktop.in.in 2020-01-19 19:59:47.537786679 +0100 -@@ -12,4 +12,4 @@ Type=Application - Categories=GTK;System;Utility;Core; - # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - Keywords=files;browser;manager;MATE; --OnlyShowIn=MATE; -+OnlyShowIn=MATE;XFCE;