diff --git a/fix_rename_gdrive.patch b/fix_rename_gdrive.patch new file mode 100644 index 0000000..b8eba2f --- /dev/null +++ b/fix_rename_gdrive.patch @@ -0,0 +1,35 @@ +From abb47a4ad34662135aa62db3fd77d37893ee0b4a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Fri, 8 Sep 2017 19:57:13 +0200 +Subject: [PATCH] file: Let renames work on Google Drive Renaming an item on + Google Drive does not change the actual GVfs path because the path is made up + of document-ids, which do not change. A rename operation only affects the + title of the entry. In GIO terms, only the standard::display-name changes, + but the standard::name remains the same. + +Therefore, if there is already a file with the same standard::name, +then don't mark it as gone if it is the same file that we are renaming. + +https://bugzilla.gnome.org/show_bug.cgi?id=740383 +--- + libnemo-private/nemo-file.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/libnemo-private/nemo-file.c b/libnemo-private/nemo-file.c +index daefcc9c5..dad5c1256 100644 +--- a/libnemo-private/nemo-file.c ++++ b/libnemo-private/nemo-file.c +@@ -1759,10 +1759,11 @@ rename_get_info_callback (GObject *source_object, + new_name = g_file_info_get_name (new_info); + + /* If there was another file by the same name in this +- * directory, mark it gone. ++ * directory and it is not the same file that we are ++ * renaming, mark it gone. + */ + existing_file = nemo_directory_find_file_by_name (directory, new_name); +- if (existing_file != NULL) { ++ if (existing_file != NULL && existing_file != op->file) { + nemo_file_mark_gone (existing_file); + nemo_file_changed (existing_file); + } diff --git a/nemo.spec b/nemo.spec index a2efa2e..cb24a7a 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,7 +1,7 @@ Name: nemo Summary: File manager for Cinnamon Version: 3.4.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/ Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -10,9 +10,11 @@ Source2: nemo-fedora.gschema.override Patch0: remove_desktop_search.patch Patch1: %url/%{name}/pull/1513.patch#/Don-t-scale-text-size-when-zooming.patch Patch2: %url/%{name}/commit/2704903578bfd8aaeda19be40cd5f15133bc439b.patch#/fix_desktop_file.patch +Patch3: %url/%{name}/pull/1598.patch#/fix_rename_gdrive.patch Requires: redhat-menus Requires: gvfs%{_isa} +Requires: gvfs-goa%{_isa} Requires: gnome-icon-theme # required for for gtk-stock fallback Requires: gnome-icon-theme-legacy @@ -174,6 +176,9 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Fri Sep 08 2017 Björn Esser - 3.4.7-7 +- Fix renaming on gDrive + * Thu Aug 31 2017 Björn Esser - 3.4.7-6 - Preserve mode of files when changing hashbang