diff options
author | Albert Vaca | 2017-07-09 23:49:54 +0200 |
---|---|---|
committer | Albert Vaca | 2017-07-09 23:59:27 +0200 |
commit | 8ab2b517acd2c0317aa1e502851df79e31470e47 (patch) | |
tree | 3a14d06540888153916f66ac7192c9a97211cfa8 | |
parent | 7ce7ad55b12c4416d8bcac623493de62cc388d58 (diff) | |
download | aur-8ab2b517acd2c0317aa1e502851df79e31470e47.tar.gz |
Updated to 3.24.1
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | nautilus-restore-typeahead.patch | 143 |
3 files changed, 79 insertions, 79 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Oct 17 05:28:58 UTC 2016 +# Sun Jul 9 21:52:20 UTC 2017 pkgbase = nautilus-typeahead pkgdesc = Default file manager for GNOME - Patched to bring back the 'typeahead find' feature - pkgver = 3.22.1 + pkgver = 3.24.1 pkgrel = 1 url = https://wiki.gnome.org/Apps/Nautilus arch = i686 @@ -25,12 +25,12 @@ pkgbase = nautilus-typeahead depends = nautilus-sendto depends = gnome-autoar options = !emptydirs - source = git://git.gnome.org/nautilus#commit=ce0c0bb5510577c9285512d2be52cba119903b96 + source = git://git.gnome.org/nautilus#commit=1bab05578caf4c6eab15d385b95358efd3354c8b source = git://git.gnome.org/libgd source = nautilus-restore-typeahead.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = 660ff8f7f5cec80c4f08862a89b63bc9fb21656fdcdc7cde057414bc269fbc54 + sha256sums = 0610a7e3eea32028b3660309be761489b45dcc49da79a4a7d2f4ab275ee5bfc3 pkgname = nautilus-typeahead install = nautilus.install @@ -1,11 +1,12 @@ # $Id: PKGBUILD 278826 2016-10-15 00:15:40Z heftig $ # Contributor: Jan de Groot <jgc@archlinux.org> # Maintainer: Ian Hernández <badwolfie@archlinux.info> +# Maintainer: Albert Vaca Cintora <albertvaka@gmail.com> _pkgbase=nautilus pkgbase=nautilus-typeahead pkgname=(nautilus-typeahead libnautilus-extension-typeahead) -pkgver=3.22.1 +pkgver=3.24.1 pkgrel=1 pkgdesc="Default file manager for GNOME - Patched to bring back the 'typeahead find' feature" url="https://wiki.gnome.org/Apps/Nautilus" @@ -14,13 +15,13 @@ license=(GPL) depends=(libexif gnome-desktop exempi gvfs dconf libtracker-sparql nautilus-sendto gnome-autoar) makedepends=(intltool gobject-introspection python packagekit python2 gnome-common git gtk-doc) options=(!emptydirs) -_commit=ce0c0bb5510577c9285512d2be52cba119903b96 # tags/3.22.1^0 +_commit=1bab05578caf4c6eab15d385b95358efd3354c8b # tags/3.24.1 source=("git://git.gnome.org/nautilus#commit=$_commit" "git://git.gnome.org/libgd" nautilus-restore-typeahead.patch) sha256sums=('SKIP' 'SKIP' - '660ff8f7f5cec80c4f08862a89b63bc9fb21656fdcdc7cde057414bc269fbc54') + '0610a7e3eea32028b3660309be761489b45dcc49da79a4a7d2f4ab275ee5bfc3') prepare() { cd $_pkgbase diff --git a/nautilus-restore-typeahead.patch b/nautilus-restore-typeahead.patch index 7951bb907976..296278f6def8 100644 --- a/nautilus-restore-typeahead.patch +++ b/nautilus-restore-typeahead.patch @@ -1,7 +1,8 @@ -diff -aur nautilus.old/data/org.gnome.nautilus.gschema.xml nautilus.new/data/org.gnome.nautilus.gschema.xml ---- nautilus.old/data/org.gnome.nautilus.gschema.xml 2016-10-16 19:18:04.643135561 -0500 -+++ nautilus.new/data/org.gnome.nautilus.gschema.xml 2016-10-16 20:41:09.028057000 -0500 -@@ -211,6 +211,11 @@ +diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml +index e162ebb42..b64e526a0 100644 +--- a/data/org.gnome.nautilus.gschema.xml ++++ b/data/org.gnome.nautilus.gschema.xml +@@ -207,6 +207,11 @@ <summary>Bulk rename utility</summary> <description>If set, Nautilus will append URIs of selected files and treat the result as a command line for bulk renaming. Bulk rename applications can register themselves in this key by setting the key to a space-separated string of their executable name and any command line options. If the executable name is not set to a full path, it will be searched for in the search path.</description> </key> @@ -13,31 +14,33 @@ diff -aur nautilus.old/data/org.gnome.nautilus.gschema.xml nautilus.new/data/org <key type="b" name="open-folder-on-dnd-hover"> <default>true</default> <summary>Whether to open the hovered folder after a timeout when drag and drop operation</summary> -diff -aur nautilus.old/src/nautilus-global-preferences.h nautilus.new/src/nautilus-global-preferences.h ---- nautilus.old/src/nautilus-global-preferences.h 2016-10-16 19:18:04.886474364 -0500 -+++ nautilus.new/src/nautilus-global-preferences.h 2016-10-16 23:59:43.699132000 -0500 -@@ -161,6 +161,9 @@ +diff --git a/src/nautilus-global-preferences.h b/src/nautilus-global-preferences.h +index 7e52f6c77..b5b761da1 100644 +--- a/src/nautilus-global-preferences.h ++++ b/src/nautilus-global-preferences.h +@@ -164,6 +164,9 @@ typedef enum /* Recent files */ #define NAUTILUS_PREFERENCES_RECENT_FILES_ENABLED "remember-recent-files" - + +/* Interactive search (typeahead) */ +#define NAUTILUS_PREFERENCES_ENABLE_INTERACTIVE_SEARCH "enable-interactive-search" + /* Move to trash shorcut changed dialog */ #define NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG "show-move-to-trash-shortcut-changed-dialog" - -diff -aur nautilus.old/src/nautilus-list-view.c nautilus.new/src/nautilus-list-view.c ---- nautilus.old/src/nautilus-list-view.c 2016-10-16 19:18:04.886474364 -0500 -+++ nautilus.new/src/nautilus-list-view.c 2016-10-16 21:06:56.350051000 -0500 -@@ -2692,6 +2692,7 @@ + +diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c +index 0d2f54fb5..9f9a1692f 100644 +--- a/src/nautilus-list-view.c ++++ b/src/nautilus-list-view.c +@@ -2706,6 +2706,7 @@ nautilus_list_view_set_selection (NautilusFilesView *view, GList *node; GList *iters, *l; NautilusFile *file; + GtkTreePath *path = NULL; - + list_view = NAUTILUS_LIST_VIEW (view); tree_selection = gtk_tree_view_get_selection (list_view->details->tree_view); -@@ -2708,10 +2709,22 @@ +@@ -2722,10 +2723,22 @@ nautilus_list_view_set_selection (NautilusFilesView *view, { gtk_tree_selection_select_iter (tree_selection, (GtkTreeIter *) l->data); @@ -47,7 +50,7 @@ diff -aur nautilus.old/src/nautilus-list-view.c nautilus.new/src/nautilus-list-v + g_list_free_full (iters, g_free); } - + + if (path) { + gtk_tree_view_set_cursor_on_cell (list_view->details->tree_view, + path, @@ -60,7 +63,7 @@ diff -aur nautilus.old/src/nautilus-list-view.c nautilus.new/src/nautilus-list-v g_signal_handlers_unblock_by_func (tree_selection, list_selection_changed_callback, view); nautilus_files_view_notify_selection_changed (view); } -@@ -3600,3 +3613,9 @@ +@@ -3600,3 +3613,9 @@ nautilus_list_view_new (NautilusWindowSlot *slot) "window-slot", slot, NULL); } @@ -70,38 +73,31 @@ diff -aur nautilus.old/src/nautilus-list-view.c nautilus.new/src/nautilus-list-v +{ + return list_view->details->tree_view; +} -diff -aur nautilus.old/src/nautilus-list-view.h nautilus.new/src/nautilus-list-view.h ---- nautilus.old/src/nautilus-list-view.h 2016-10-16 19:18:04.886474364 -0500 -+++ nautilus.new/src/nautilus-list-view.h 2016-10-16 21:07:31.957305000 -0500 -@@ -3,7 +3,7 @@ - - Copyright (C) 2000 Eazel, Inc. - Copyright (C) 2001 Anders Carlsson <andersca@gnu.org> -- -+ - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the -@@ -52,5 +52,6 @@ - +diff --git a/src/nautilus-list-view.h b/src/nautilus-list-view.h +index f77543100..bbcb565d7 100644 +--- a/src/nautilus-list-view.h ++++ b/src/nautilus-list-view.h +@@ -52,5 +52,6 @@ typedef struct { + GType nautilus_list_view_get_type (void); NautilusFilesView * nautilus_list_view_new (NautilusWindowSlot *slot); +GtkTreeView * nautilus_list_view_get_tree_view (NautilusListView *list_view); - + #endif /* NAUTILUS_LIST_VIEW_H */ -diff -aur nautilus.old/src/nautilus-preferences-window.c nautilus.new/src/nautilus-preferences-window.c ---- nautilus.old/src/nautilus-preferences-window.c 2016-10-16 19:18:04.889807772 -0500 -+++ nautilus.new/src/nautilus-preferences-window.c 2016-10-17 00:07:59.794336000 -0500 +diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c +index 8c4f981c0..b545fc3ec 100644 +--- a/src/nautilus-preferences-window.c ++++ b/src/nautilus-preferences-window.c @@ -59,6 +59,8 @@ "trash_confirm_checkbutton" #define NAUTILUS_PREFERENCES_DIALOG_AUTOMATIC_DECOMPRESSION_WIDGET \ "automatic_decompression_checkbutton" +#define NAUTILUS_PREFERENCES_DIALOG_ENABLE_INTERACTIVE_SEARCH_WIDGET \ + "interactive_search_checkbutton" - + /* int enums */ #define NAUTILUS_PREFERENCES_DIALOG_THUMBNAIL_LIMIT_WIDGET \ -@@ -505,6 +507,9 @@ +@@ -492,6 +494,9 @@ static void nautilus_preferences_window_setup(GtkBuilder *builder, bind_builder_bool (builder, nautilus_preferences, NAUTILUS_PREFERENCES_DIALOG_AUTOMATIC_DECOMPRESSION_WIDGET, NAUTILUS_PREFERENCES_AUTOMATIC_DECOMPRESSION); @@ -111,10 +107,11 @@ diff -aur nautilus.old/src/nautilus-preferences-window.c nautilus.new/src/nautil bind_builder_bool (builder, nautilus_list_view_preferences, NAUTILUS_PREFERENCES_DIALOG_LIST_VIEW_USE_TREE_WIDGET, NAUTILUS_PREFERENCES_LIST_VIEW_USE_TREE); -diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-window-slot.c ---- nautilus.old/src/nautilus-window-slot.c 2016-10-16 19:18:04.906474814 -0500 -+++ nautilus.new/src/nautilus-window-slot.c 2016-10-16 23:43:32.891991000 -0500 -@@ -120,6 +120,17 @@ +diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c +index c5c94e103..67a6fd0a9 100644 +--- a/src/nautilus-window-slot.c ++++ b/src/nautilus-window-slot.c +@@ -122,6 +122,17 @@ typedef struct GError *mount_error; gboolean tried_mount; gint view_mode_before_search; @@ -130,12 +127,12 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + guint isearch_timeout_id; + gulong isearch_configure_event_id; } NautilusWindowSlotPrivate; - + G_DEFINE_TYPE_WITH_PRIVATE (NautilusWindowSlot, nautilus_window_slot, GTK_TYPE_BOX); -@@ -147,6 +158,97 @@ - static gboolean nautilus_window_slot_get_search_visible (NautilusWindowSlot *self); - static void nautilus_window_slot_set_location (NautilusWindowSlot *self, - GFile *location); +@@ -153,6 +164,98 @@ static void trash_state_changed_cb (NautilusTrashMonitor *monitor, + gboolean is_empty, + gpointer user_data); + + +/* Interactive search */ +static void isearch_ensure (NautilusWindowSlot *slot); @@ -227,13 +224,14 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + +#define ISEARCH_TIMEOUT 5000 + ++ gboolean nautilus_window_slot_handles_location (NautilusWindowSlot *self, GFile *location) -@@ -563,21 +665,86 @@ +@@ -569,21 +672,86 @@ nautilus_window_slot_handle_event (NautilusWindowSlot *self, action = g_action_map_lookup_action (G_ACTION_MAP (priv->slot_action_group), "search-visible"); - + - /* If the action is not enabled, don't try to handle search */ - if (g_action_get_enabled (action)) - { @@ -290,7 +288,7 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + gtk_widget_grab_focus (GTK_WIDGET (self)); + return TRUE; + } - + - if (retval) - { - nautilus_window_slot_set_search_visible (self, TRUE); @@ -310,10 +308,10 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + nautilus_window_slot_set_search_visible (self, TRUE); + } } - + return retval; } - + +/* static gboolean +configure_event_cb (GtkWidget *widget, + GdkEventConfigure *event, @@ -326,16 +324,16 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind static void real_active (NautilusWindowSlot *self) { -@@ -606,10 +773,19 @@ +@@ -612,10 +780,19 @@ static void real_inactive (NautilusWindowSlot *self) { NautilusWindow *window; + NautilusWindowSlotPrivate *priv; - + + priv = nautilus_window_slot_get_instance_private (self); window = nautilus_window_slot_get_window (self); g_assert (self == nautilus_window_get_active_slot (window)); - + + isearch_hide (self, NULL); + if (priv->isearch_configure_event_id != 0) { + g_signal_handler_disconnect (GTK_WIDGET (priv->window), @@ -345,11 +343,11 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + gtk_widget_insert_action_group (GTK_WIDGET (window), "slot", NULL); } - -@@ -898,9 +1074,30 @@ + +@@ -908,9 +1085,30 @@ nautilus_window_slot_init (NautilusWindowSlot *self) nautilus_application_set_accelerator (app, "slot.files-view-mode(uint32 0)", "<control>2"); nautilus_application_set_accelerator (app, "slot.search-visible", "<control>f"); - + + priv->isearch_enable = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_ENABLE_INTERACTIVE_SEARCH); + @@ -360,7 +358,7 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + priv->view_mode_before_search = NAUTILUS_VIEW_INVALID_ID; } - + +static void +nautilus_window_slot_finalize (GObject *object) +{ @@ -376,25 +374,25 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + #define DEBUG_FLAG NAUTILUS_DEBUG_WINDOW #include "nautilus-debug.h" - -@@ -2643,6 +2840,7 @@ - + +@@ -2687,6 +2885,7 @@ nautilus_window_slot_dispose (GObject *object) + self = NAUTILUS_WINDOW_SLOT (object); priv = nautilus_window_slot_get_instance_private (self); + isearch_dispose (self); - + nautilus_window_slot_clear_forward_list (self); nautilus_window_slot_clear_back_list (self); -@@ -2731,6 +2929,7 @@ +@@ -2777,6 +2976,7 @@ nautilus_window_slot_class_init (NautilusWindowSlotClass *klass) oclass->constructed = nautilus_window_slot_constructed; oclass->set_property = nautilus_window_slot_set_property; oclass->get_property = nautilus_window_slot_get_property; + oclass->finalize = nautilus_window_slot_finalize; - + widget_class->grab_focus = nautilus_window_slot_grab_focus; - -@@ -3122,3 +3321,792 @@ - + +@@ -3198,3 +3398,792 @@ nautilus_window_slot_get_loading (NautilusWindowSlot *self) + return priv->loading; } + @@ -1186,10 +1184,11 @@ diff -aur nautilus.old/src/nautilus-window-slot.c nautilus.new/src/nautilus-wind + priv->isearch_entry = NULL; + } +} -diff -aur nautilus.old/src/resources/ui/nautilus-preferences-window.ui nautilus.new/src/resources/ui/nautilus-preferences-window.ui ---- nautilus.old/src/resources/ui/nautilus-preferences-window.ui 2016-10-16 19:18:04.909808221 -0500 -+++ nautilus.new/src/resources/ui/nautilus-preferences-window.ui 2016-10-16 23:54:26.729954000 -0500 -@@ -802,6 +802,56 @@ +diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui +index 96a2be860..b1cb7c3d0 100644 +--- a/src/resources/ui/nautilus-preferences-window.ui ++++ b/src/resources/ui/nautilus-preferences-window.ui +@@ -802,6 +802,56 @@ More information will appear when zooming closer.</property> <property name="position">4</property> </packing> </child> |