[nemo/epel7] X-Cinnamon fix
leigh123linux
leigh123linux at fedoraproject.org
Sat Jun 14 17:13:18 UTC 2014
commit 5ccd74943c6572e945740af7018b6c66795cd6df
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sat Jun 14 18:13:10 2014 +0100
X-Cinnamon fix
...add-desktop-file-hack-for-desktop-session.patch | 31 ++++++++++++++++++++
nemo.spec | 6 +++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0002-nemo-links-add-desktop-file-hack-for-desktop-session.patch b/0002-nemo-links-add-desktop-file-hack-for-desktop-session.patch
new file mode 100644
index 0000000..4c64487
--- /dev/null
+++ b/0002-nemo-links-add-desktop-file-hack-for-desktop-session.patch
@@ -0,0 +1,31 @@
+From f69c7ff91d481035f8872f99d7711ec191b56460 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster at gmail.com>
+Date: Sat, 14 Jun 2014 12:38:35 -0400
+Subject: [PATCH 2/2] nemo-links: add desktop file hack for desktop session
+ names.
+
+Fixes linuxmint/Cinnamon#3269
+
+This is an overlooked bit of fallout from the
+GNOME->X-Cinnamon->Cinnamon desktop name transition.
+---
+ libnemo-private/nemo-link.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libnemo-private/nemo-link.c b/libnemo-private/nemo-link.c
+index 706eeeb..a134cce 100644
+--- a/libnemo-private/nemo-link.c
++++ b/libnemo-private/nemo-link.c
+@@ -579,7 +579,8 @@ nemo_link_get_link_info_given_file_contents (const char *file_contents,
+ *is_foreign = FALSE;
+ only_show_in = g_key_file_get_string_list (key_file, MAIN_GROUP,
+ "OnlyShowIn", NULL, NULL);
+- if (session && only_show_in && !string_array_contains (only_show_in, session)) {
++ if (session && only_show_in && !(string_array_contains (only_show_in, session) ||
++ string_array_contains (only_show_in, "GNOME"))) {
+ *is_foreign = TRUE;
+ }
+ g_strfreev (only_show_in);
+--
+1.9.3
+
diff --git a/nemo.spec b/nemo.spec
index fd5c367..0554070 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -3,7 +3,7 @@
Name: nemo
Summary: File manager for Cinnamon
Version: 2.0.8
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
URL: https://github.com/linuxmint/nemo
@@ -23,6 +23,7 @@ Patch4: 0001-Change-OnlyShowIn-to-X-Cinnamon-for-autostart-deskto.patch
Patch5: 0001-Show-unmount-progress-notifications-when-ejecting-a-.patch
Patch6: 0002-Fix-627-crash-when-unmounting-archives.-This-is-a-te.patch
Patch7: 0003-Refactor-bookmarks-code-a-bit-from-upstream-specific.patch
+Patch8: 0002-nemo-links-add-desktop-file-hack-for-desktop-session.patch
Requires: redhat-menus
Requires: gvfs
@@ -191,6 +192,9 @@ fi
%{_datadir}/gir-1.0/*.gir
%changelog
+* Sat Jun 14 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.8-12
+- X-Cinnamon fix
+
* Fri Jun 13 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.8-11
- add upstream patches to fix bookmarks
More information about the scm-commits
mailing list