From 6b744cf280546c76c12216ea8d6c9234eeb911af Mon Sep 17 00:00:00 2001 From: wangxiaoqing Date: Fri, 29 Jul 2022 13:51:42 +0800 Subject: [PATCH] Fix the file rename error msg too long Signed-off-by: wangxiaoqing --- ...x-the-file-rename-error-msg-too-long.patch | 59 +++++++++++++++++++ caja.spec | 6 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-the-file-rename-error-msg-too-long.patch diff --git a/0001-Fix-the-file-rename-error-msg-too-long.patch b/0001-Fix-the-file-rename-error-msg-too-long.patch new file mode 100644 index 0000000..02b1b89 --- /dev/null +++ b/0001-Fix-the-file-rename-error-msg-too-long.patch @@ -0,0 +1,59 @@ +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/caja.spec b/caja.spec index c03aa48..290bc10 100755 --- a/caja.spec +++ b/caja.spec @@ -16,7 +16,7 @@ Name: caja Summary: File manager for MATE Version: %{branch}.1 %if 0%{?rel_build} -Release: 7 +Release: 8 %else Release: 0.15%{?git_rel} %endif @@ -34,6 +34,7 @@ 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 BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils @@ -185,6 +186,9 @@ EOF %changelog +* 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