summaryrefslogtreecommitdiff
path: root/gnome-base/nautilus/files
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/nautilus/files')
-rw-r--r--gnome-base/nautilus/files/nautilus-3.0.2-fix-autostart-live-boot.patch8
-rw-r--r--gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch51
-rw-r--r--gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch38
-rw-r--r--gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch28
-rw-r--r--gnome-base/nautilus/files/nautilus-3.2.1-startup-notify.patch12
-rw-r--r--gnome-base/nautilus/files/nautilus-3.5.91-delete.patch44
6 files changed, 0 insertions, 181 deletions
diff --git a/gnome-base/nautilus/files/nautilus-3.0.2-fix-autostart-live-boot.patch b/gnome-base/nautilus/files/nautilus-3.0.2-fix-autostart-live-boot.patch
deleted file mode 100644
index 5b0454be..00000000
--- a/gnome-base/nautilus/files/nautilus-3.0.2-fix-autostart-live-boot.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Nurp nautilus-3.0.2.orig/data/nautilus-autostart.desktop.in nautilus-3.0.2/data/nautilus-autostart.desktop.in
---- nautilus-3.0.2.orig/data/nautilus-autostart.desktop.in 2011-05-24 20:46:10.000000000 +0200
-+++ nautilus-3.0.2/data/nautilus-autostart.desktop.in 2011-09-24 14:17:30.315989535 +0200
-@@ -3,3 +3,4 @@ Type=Application
- Name=Files
- Exec=nautilus -n
- AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
-+X-GNOME-Autostart-Phase=Desktop
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch b/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
deleted file mode 100644
index b1941996..00000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From c9f259ca8f5541ac879320b5d168ae7b4bc46d86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nelson=20Ben=C3=ADtez=20Le=C3=B3n?=
- <nbenitezl+gnome@gmail.com>
-Date: Sat, 27 Dec 2014 00:27:36 +0500
-Subject: nautilus-window: make sure active slot is closed last
-
-When destroying window and closing all slots, the closing
-of the active slot will trigger activation of next free slot,
-we don't want to be activating slots as part of
-'closing all slots' logic.
-
-Fixes bug 741952
-
-diff --git a/src/nautilus-window.c b/src/nautilus-window.c
-index 124fc57..38dea35 100644
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -1531,6 +1531,18 @@ nautilus_window_get_property (GObject *object,
- }
- }
-
-+static gint
-+sort_slots_active_last (NautilusWindowSlot *a, NautilusWindowSlot *b, NautilusWindow *window)
-+{
-+ if (window->details->active_slot == a) {
-+ return 1;
-+ }
-+ if (window->details->active_slot == b) {
-+ return -1;
-+ }
-+ return 0;
-+}
-+
- static void
- destroy_slots_foreach (gpointer data,
- gpointer user_data)
-@@ -1557,6 +1569,11 @@ nautilus_window_destroy (GtkWidget *object)
-
- /* close all slots safely */
- slots_copy = g_list_copy (window->details->slots);
-+ if (window->details->active_slot != NULL) {
-+ /* Make sure active slot is last one to be closed, to avoid default activation
-+ * of others slots when closing the active one, see bug #741952 */
-+ slots_copy = g_list_sort_with_data (slots_copy, (GCompareFunc) sort_slots_active_last, window);
-+ }
- g_list_foreach (slots_copy, (GFunc) destroy_slots_foreach, window);
- g_list_free (slots_copy);
-
---
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch b/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
deleted file mode 100644
index a106f4cd..00000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001
-From: Carlos Soriano <carlos.sorian89@gmail.com>
-Date: Fri, 5 Dec 2014 17:57:19 +0100
-Subject: nautilus-application: Parse force-desktop before exiting
-
-In commit ae4d4960 we introduced a regression that a new window was
-openned if both --no-default-window and --force-desktop options were
-used.
-
-To avoid that, activate those options before actually skipping the
-activate of the application if --no-default-window option is provided.
-
-The application nornally would exit if --no-default-window is provided
-and the show-desktop-window is not activated, but, we rely on a the
-detail that activating the open-desktop action when --force-desktop is
-provided as a option, creates a new window, which makes the application
-keep alive.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741166
-
-diff --git a/src/nautilus-application.c b/src/nautilus-application.c
-index f26c8c7..c336a39 100644
---- a/src/nautilus-application.c
-+++ b/src/nautilus-application.c
-@@ -930,7 +930,9 @@ nautilus_application_handle_local_options (GApplication *application,
- self->priv->desktop_override = TRUE;
- g_action_group_activate_action (G_ACTION_GROUP (application),
- "close-desktop", NULL);
-- } else if (g_variant_dict_contains (options, "no-default-window")) {
-+ }
-+
-+ if (g_variant_dict_contains (options, "no-default-window")) {
- /* We want to avoid trigering the activate signal; so no window is created.
- * GApplication doesn't call activate if we return a value >= 0.
- * Use EXIT_SUCCESS since is >= 0. */
---
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch b/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
deleted file mode 100644
index 54d5d5a5..00000000
--- a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 29ed1dee800341e8fcde739d0561ecc9d14e7f10 Mon Sep 17 00:00:00 2001
-From: Carlos Soriano <carlos.soriano89@gmail.com>
-Date: Fri, 22 Aug 2014 19:18:30 +0200
-Subject: nautilus-list-view: Avoid unreadable names
-
-Currently if the view is resized, the column name is resized as well
-given that use ellipsization allowing the column to become unreadable.
-To avoid that, use width-chars property to set a desired width, but at
-the same time allowing the user to resize without limits the name column
-if desired.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=732004
-
-diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
-index 8711af6..b361734 100644
---- a/src/nautilus-list-view.c
-+++ b/src/nautilus-list-view.c
-@@ -2066,6 +2066,7 @@ create_and_set_up_tree_view (NautilusListView *view)
- g_object_set (cell,
- "ellipsize", PANGO_ELLIPSIZE_END,
- "single-paragraph-mode", TRUE,
-+ "width-chars", 30,
- "xpad", 5,
- NULL);
-
---
-cgit v0.10.1
-
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-startup-notify.patch b/gnome-base/nautilus/files/nautilus-3.2.1-startup-notify.patch
deleted file mode 100644
index dd5ea10a..00000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-startup-notify.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Sabayon bug 2797, reported by micia.
---- a/data/nautilus.desktop.in.in
-+++ b/data/nautilus.desktop.in.in
-@@ -91,7 +91,7 @@
- Icon=system-file-manager
- Terminal=false
- Type=Application
--StartupNotify=true
-+StartupNotify=false
- OnlyShowIn=GNOME;Unity;
- Categories=GNOME;GTK;Utility;Core;
- MimeType=inode/directory;application/x-gnome-saved-search;
diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
deleted file mode 100644
index 072b34ea..00000000
--- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 8 Dec 2011 18:39:28 -0500
-Subject: [PATCH] Delete key should delete files
-
-Make the Delete key delete files like in nautilus-2.x and every other
-file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut
-will also continue to work.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647048
-https://bugs.gentoo.org/show_bug.cgi?id=393663
----
- src/nautilus-view.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index f51d916..0a50994 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = {
- /* tooltip */ NULL,
- G_CALLBACK (action_rename_select_all_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_TRASH, NULL,
-- /* label, accelerator */ N_("Mo_ve to Trash"), "<control>Delete",
-+ /* label, accelerator */ N_("Mo_ve to Trash"), "Delete",
- /* tooltip */ N_("Move each selected item to the Trash"),
- G_CALLBACK (action_trash_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_DELETE, NULL,
-@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
- binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
- "trash", 0);
-+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
-+ "trash", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
- "trash", 0);
-+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
-+ "trash", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
- "delete", 0);
- }
---
-1.7.12
-