diff options
Diffstat (limited to 'gnome-base/nautilus/files')
3 files changed, 117 insertions, 0 deletions
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 new file mode 100644 index 00000000..b1941996 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch @@ -0,0 +1,51 @@ +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 new file mode 100644 index 00000000..a106f4cd --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch @@ -0,0 +1,38 @@ +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 new file mode 100644 index 00000000..54d5d5a5 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch @@ -0,0 +1,28 @@ +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 + |