Added typeahead patch. Added patch to show remote locations in bookmarks.

4 files changed, 104 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 723f64cbb3d5..b361aa3049b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -51,6 +51,7 @@ pkgbase = gtk3-mushrooms
 	source = general__always-show-scrollbars.patch
 	source = print-dialog__appearance.patch
 	source = print-dialog__default-previewer.patch
+	source = typeahead.patch
 	source = https://github.com/GNOME/gtk/archive/3.22.12.tar.gz
 	source = settings.ini
 	source = gtk-query-immodules-3.0.hook
@@ -58,12 +59,13 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 2251f75f3fd8af92f71e7d31d616303e18596e37a59e293748521972ef185578
 	sha256sums = a4015d73585d97dc80f7b01cfc6960fd94e570d7abe3105aff7aed139b6513be
 	sha256sums = 676cff1d71c13600f4c0fba082cb6aba93e8c570063779a745851275d8a287c7
-	sha256sums = 3e91bb31dc3a34d9cd8388ee97d450ddb22c2ef74a75d9b3f0226ed7850755c7
+	sha256sums = fb24c78bf536f5c13bd359b760bfd3267bbdf7b62c1397519a995080138b9049
 	sha256sums = 506a214562144912afc14d52b20a676c3ca0d34232c8db60e3b24f7ab22cb6cb
 	sha256sums = d3b0905b9f76afbe236f9c7091a2957d25e112abf9100707c48c948d6ddaf5e5
 	sha256sums = 3bfe58be30338daa30a9eacba82420ca4df6f8f5b5b2d0df5b9a77b018ab0cec
 	sha256sums = f14cd9983ada3fab3f22ce6ef7fcdd6afb9253f0bf5b9de20255fe0e8c56d685
 	sha256sums = 886f9ca521285974617eff66e5060b429c4be56b205444e457b6bfdd24f60ca4
+	sha256sums = 958e7188f23ed5937bcb0f5c09c87332bcea0ca66b0333390d0de73b2ccbae82
 	sha256sums = bec9108c4892041988635f7e276724828b17a0522b211c190530a1f76f88cbae
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
diff --git a/PKGBUILD b/PKGBUILD
index 55f9c05c05c2..95b31533d55a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Tomasz Gąsior <tomaszgasior.pl>
+# Maintainer: Vladimir Pinchuck <vladimir.pinchuk01@gmail.com>
 
 pkgname=gtk3-mushrooms
 pkgver=3.22.12
@@ -27,27 +27,26 @@ source=(
         "general__always-show-scrollbars.patch"
         "print-dialog__appearance.patch"
         "print-dialog__default-previewer.patch"
+        "typeahead.patch"
 
         "https://github.com/GNOME/gtk/archive/$pkgver.tar.gz"
         settings.ini
         gtk-query-immodules-3.0.hook
        )
-sha256sums=(
-            "d8214e11bfcee96552ce5911b1d172ce8076313685d5897f9bd0655df546341b"
-            "2251f75f3fd8af92f71e7d31d616303e18596e37a59e293748521972ef185578"
-            "a4015d73585d97dc80f7b01cfc6960fd94e570d7abe3105aff7aed139b6513be"
-            "676cff1d71c13600f4c0fba082cb6aba93e8c570063779a745851275d8a287c7"
-            "3e91bb31dc3a34d9cd8388ee97d450ddb22c2ef74a75d9b3f0226ed7850755c7"
-            "506a214562144912afc14d52b20a676c3ca0d34232c8db60e3b24f7ab22cb6cb"
-            "d3b0905b9f76afbe236f9c7091a2957d25e112abf9100707c48c948d6ddaf5e5"
-            "3bfe58be30338daa30a9eacba82420ca4df6f8f5b5b2d0df5b9a77b018ab0cec"
-            "f14cd9983ada3fab3f22ce6ef7fcdd6afb9253f0bf5b9de20255fe0e8c56d685"
-            "886f9ca521285974617eff66e5060b429c4be56b205444e457b6bfdd24f60ca4"
-
-            "bec9108c4892041988635f7e276724828b17a0522b211c190530a1f76f88cbae"  # GTK package
-            "01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202"
-            "de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845"
-	       )
+sha256sums=('d8214e11bfcee96552ce5911b1d172ce8076313685d5897f9bd0655df546341b'
+            '2251f75f3fd8af92f71e7d31d616303e18596e37a59e293748521972ef185578'
+            'a4015d73585d97dc80f7b01cfc6960fd94e570d7abe3105aff7aed139b6513be'
+            '676cff1d71c13600f4c0fba082cb6aba93e8c570063779a745851275d8a287c7'
+            'fb24c78bf536f5c13bd359b760bfd3267bbdf7b62c1397519a995080138b9049'
+            '506a214562144912afc14d52b20a676c3ca0d34232c8db60e3b24f7ab22cb6cb'
+            'd3b0905b9f76afbe236f9c7091a2957d25e112abf9100707c48c948d6ddaf5e5'
+            '3bfe58be30338daa30a9eacba82420ca4df6f8f5b5b2d0df5b9a77b018ab0cec'
+            'f14cd9983ada3fab3f22ce6ef7fcdd6afb9253f0bf5b9de20255fe0e8c56d685'
+            '886f9ca521285974617eff66e5060b429c4be56b205444e457b6bfdd24f60ca4'
+            '958e7188f23ed5937bcb0f5c09c87332bcea0ca66b0333390d0de73b2ccbae82'
+            'bec9108c4892041988635f7e276724828b17a0522b211c190530a1f76f88cbae'
+            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+            'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845')
 
 prepare() {
     gtk_source="$srcdir/gtk-$pkgver/gtk"
@@ -62,6 +61,7 @@ prepare() {
     patch "$gtk_source/gtkplacessidebar.c" "file-chooser__hide-xdg-dirs.patch"
     patch "$gtk_source/gtkfilechooserwidget.c" "file-chooser__single-click.patch"
     patch "$gtk_source/ui/gtkfilechooserwidget.ui" "file-chooser__disable-other-locations.patch"
+    patch "$gtk_source/gtkfilechooserwidget.c" -i "typeahead.patch"
 
     # print dialog
     patch "$gtk_source/gtksettings.c" "print-dialog__default-previewer.patch"
diff --git a/file-chooser__disable-other-locations.patch b/file-chooser__disable-other-locations.patch
index 1d5457922efb..05ce8bb5f9c1 100644
--- a/file-chooser__disable-other-locations.patch
+++ b/file-chooser__disable-other-locations.patch
@@ -1,10 +1,12 @@
---- src/gtk+/gtk/ui/gtkfilechooserwidget.ui	2017-04-16 00:01:55.880507000 +0200
-+++ modified_files/gtkfilechooserwidget.ui	2017-04-16 19:56:37.100403946 +0200
-@@ -16,7 +16,7 @@
+--- ./gtk-orig/gtk/ui/gtkfilechooserwidget.ui	2017-04-08 22:15:58.000000000 +0300
++++ ./gtk-mod/gtk/ui/gtkfilechooserwidget.ui	2017-04-21 19:07:19.034873993 +0300
+@@ -15,8 +15,8 @@
+               <object class="GtkPlacesSidebar" id="places_sidebar">
                  <property name="visible">1</property>
                  <property name="hscrollbar-policy">never</property>
-                 <property name="local-only">1</property>
+-                <property name="local-only">1</property>
 -                <property name="show-other-locations">1</property>
++                <property name="local-only">0</property>
 +                <property name="show-other-locations">0</property>
                  <style>
                    <class name="sidebar"/>
diff --git a/typeahead.patch b/typeahead.patch
new file mode 100644
index 000000000000..106deb986b13
--- /dev/null
+++ b/typeahead.patch
@@ -0,0 +1,78 @@
+@@ -1391,6 +1391,9 @@
+ {
+   GtkFileChooserWidget *impl = (GtkFileChooserWidget *) widget;
+   GtkFileChooserWidgetPrivate *priv = impl->priv;
++  gtk_widget_grab_focus (priv->browse_files_tree_view);
++  gboolean ret;
++  g_signal_emit_by_name (priv->browse_files_tree_view, "key-press-event", event, &ret);
+ 
+   if (should_trigger_location_entry (impl, event))
+     {
+@@ -1401,12 +1404,6 @@
+           return TRUE;
+         }
+     }
+-  else if (gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event))
+-    {
+-      if (priv->operation_mode != OPERATION_MODE_SEARCH)
+-        operation_mode_set (impl, OPERATION_MODE_SEARCH);
+-      return TRUE;
+-    }
+ 
+   if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->key_press_event (widget, event))
+     return TRUE;
+@@ -2478,7 +2475,7 @@
+ {
+   GtkFileChooserWidgetPrivate *priv = impl->priv;
+ 
+-  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
++  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), MODEL_COL_NAME);
+ 
+   gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
+   gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
+@@ -4392,6 +4389,7 @@
+   gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
+                            GTK_TREE_MODEL (priv->browse_files_model));
+   update_columns (impl, FALSE, _("Modified"));
++  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->browse_files_tree_view), TRUE);
+   file_list_set_sort_column_ids (impl);
+   set_sort_column (impl);
+   profile_msg ("    gtk_tree_view_set_model end", NULL);
+@@ -7152,10 +7150,6 @@
+ {
+   GList *l, *files, *files_with_info, *infos;
+   GFile *file;
+-  gboolean select = FALSE;
+-
+-  if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (impl->priv->search_model), NULL) == 0)
+-    select = TRUE;
+ 
+   files = NULL;
+   files_with_info = NULL;
+@@ -7183,8 +7177,6 @@
+   g_list_free_full (infos, g_object_unref);
+ 
+   gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list");
+-  if (select)
+-    gtk_widget_grab_focus (impl->priv->browse_files_tree_view);
+ }
+ 
+ /* Callback used from GtkSearchEngine when the query is done running */
+@@ -7502,6 +7494,7 @@
+   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model),
+                                         GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+                                         GTK_SORT_DESCENDING);
++  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->browse_files_tree_view), TRUE);
+ }
+ 
+ typedef struct
+@@ -7519,7 +7512,7 @@
+ 
+   gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
+                            GTK_TREE_MODEL (priv->recent_model));
+-  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
++  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), MODEL_COL_NAME);
+ 
+   gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
+   gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
+