summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD6
-rw-r--r--typeahead.patch30
3 files changed, 33 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 834b859555b9..a83636086600 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Feb 27 08:01:44 UTC 2016
+# Sat Mar 19 11:56:55 UTC 2016
pkgbase = gtk3-typeahead
pkgdesc = GTK+ 3 with typeahead feature enabled for the file chooser widget
- pkgver = 3.18.8
+ pkgver = 3.18.9
pkgrel = 1
url = http://www.gtk.org/
install = gtk3.install
@@ -35,14 +35,14 @@ pkgbase = gtk3-typeahead
depends = librsvg
depends = gtk-update-icon-cache
optdepends = libcanberra: gtk3-widget-factory demo
- provides = gtk3=3.18.8
+ provides = gtk3=3.18.9
conflicts = gtk3
- source = https://download.gnome.org/sources/gtk+/3.18/gtk+-3.18.8.tar.xz
+ source = https://download.gnome.org/sources/gtk+/3.18/gtk+-3.18.9.tar.xz
source = settings.ini
source = typeahead.patch
- sha256sums = 1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8
+ sha256sums = 783d7f8b00f9b4224cc94d7da885a67598e711c2d6d79c9c873c6b203e83acbd
sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
- sha256sums = d9db275d3c6e63b9587c99185ae4e370d8ae76e343196d218e19c148abd21762
+ sha256sums = 029a05a3475bf54f1f1617e7b7a10d589a098b30e0beee1d7a0fdc42d05202ce
pkgname = gtk3-typeahead
install = gtk3.install
diff --git a/PKGBUILD b/PKGBUILD
index 4906ca8ffcff..52ab966c3cfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: twilinx <twilinx@mesecons.net>
pkgname=gtk3-typeahead
-pkgver=3.18.8
+pkgver=3.18.9
pkgrel=1
conflicts=(gtk3)
provides=("gtk3=$pkgver")
@@ -17,9 +17,9 @@ makedepends=(gobject-introspection libcanberra gtk-doc)
license=(LGPL)
source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
settings.ini typeahead.patch)
-sha256sums=('1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8'
+sha256sums=('783d7f8b00f9b4224cc94d7da885a67598e711c2d6d79c9c873c6b203e83acbd'
'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'd9db275d3c6e63b9587c99185ae4e370d8ae76e343196d218e19c148abd21762')
+ '029a05a3475bf54f1f1617e7b7a10d589a098b30e0beee1d7a0fdc42d05202ce')
prepare() {
cd gtk+-$pkgver
diff --git a/typeahead.patch b/typeahead.patch
index 76fc30c6b109..d490950cc6a2 100644
--- a/typeahead.patch
+++ b/typeahead.patch
@@ -1,4 +1,14 @@
-@@ -1382,12 +1382,6 @@
+@@ -1372,6 +1372,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))
+ {
+@@ -1382,12 +1385,6 @@
return TRUE;
}
}
@@ -11,7 +21,7 @@
if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->key_press_event (widget, event))
return TRUE;
-@@ -2457,7 +2451,7 @@
+@@ -2457,7 +2454,7 @@
{
GtkFileChooserWidgetPrivate *priv = impl->priv;
@@ -20,7 +30,7 @@
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);
-@@ -4360,6 +4354,7 @@
+@@ -4360,6 +4357,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"));
@@ -28,7 +38,7 @@
file_list_set_sort_column_ids (impl);
set_sort_column (impl);
profile_msg (" gtk_tree_view_set_model end", NULL);
-@@ -7101,10 +7096,6 @@
+@@ -7101,10 +7099,6 @@
{
GList *l, *files, *files_with_info, *infos;
GFile *file;
@@ -39,7 +49,7 @@
files = NULL;
files_with_info = NULL;
-@@ -7132,8 +7123,6 @@
+@@ -7132,8 +7126,6 @@
g_list_free_full (infos, g_object_unref);
gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list");
@@ -48,7 +58,15 @@
}
/* Callback used from GtkSearchEngine when the query is done running */
-@@ -7468,7 +7457,7 @@
+@@ -7451,6 +7443,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
+@@ -7468,7 +7461,7 @@
gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
GTK_TREE_MODEL (priv->recent_model));