Recently files reenabled. CWD default in file chooser.

- Recently files feature is enabled now.
- Default view in file chooser is changed from "recent" to "cwd".
- "smaller-adwaita.css" stylesheed is appended also to HighContrast
themes.

5 files changed, 43 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecde44e8ca53..492bfec392fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 library with my modifications (see README).
 	pkgver = 3.22.15
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.gtk.org/
 	install = gtk3.install
 	arch = i686
@@ -38,6 +38,7 @@ pkgbase = gtk3-mushrooms
 	optdepends = gtk3-print-backends: Printing
 	provides = gtk3=3.22.15
 	conflicts = gtk3
+	source = p__file-chooser__cwd-default.patch
 	source = p__file-chooser__places-sidebar.patch
 	source = p__file-chooser__single-click.patch
 	source = p__file-chooser__typeahead.patch
@@ -56,7 +57,8 @@ pkgbase = gtk3-mushrooms
 	source = https://github.com/GNOME/gtk/archive/3.22.15.zip
 	source = settings.ini
 	source = gtk-query-immodules-3.0.hook
-	sha256sums = e2d1425b2d377db426b56fcf127d245aef6570af0145d4c3ec7dff75a0af11d9
+	sha256sums = da49c43e1b8c53b0fb3a6309f18668952ca7128a4fdcfb97098a7ec9959b1fc6
+	sha256sums = 0615c4aec2ee47d79eee3a27e73b8156e927479c6ee4f1f165e5aaed98a01284
 	sha256sums = 79e69afe150a0393be17f1f8fc65c7c10540ef631a6ea657b01eaf0a99f5ffc5
 	sha256sums = 1824f7136c05dfc2657a6cc7cc45fae5ededb9f06e899e28982a068824123ac2
 	sha256sums = 49c9847239511c2db0be46cb8f660c2c4a43a45b3deed4443eb449daf9ceaf21
diff --git a/PKGBUILD b/PKGBUILD
index 007468b65f8a..a74d14181287 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gtk3-mushrooms
 pkgver=3.22.15
-pkgrel=5
+pkgrel=6
 pkgdesc="GTK3 library with my modifications (see README)."
 url="http://www.gtk.org/"
 install=gtk3.install
@@ -25,6 +25,7 @@ makedepends=(
 	gobject-introspection libcanberra gtk-doc rest libcups glib2-docs
 )
 source=(
+	"p__file-chooser__cwd-default.patch"
 	"p__file-chooser__places-sidebar.patch"
 	"p__file-chooser__single-click.patch"
 	"p__file-chooser__typeahead.patch"
@@ -47,7 +48,8 @@ source=(
 	"gtk-query-immodules-3.0.hook"
 )
 sha256sums=(
-	"e2d1425b2d377db426b56fcf127d245aef6570af0145d4c3ec7dff75a0af11d9"
+	"da49c43e1b8c53b0fb3a6309f18668952ca7128a4fdcfb97098a7ec9959b1fc6"
+	"0615c4aec2ee47d79eee3a27e73b8156e927479c6ee4f1f165e5aaed98a01284"
 	"79e69afe150a0393be17f1f8fc65c7c10540ef631a6ea657b01eaf0a99f5ffc5"
 	"1824f7136c05dfc2657a6cc7cc45fae5ededb9f06e899e28982a068824123ac2"
 	"49c9847239511c2db0be46cb8f660c2c4a43a45b3deed4443eb449daf9ceaf21"
@@ -78,6 +80,8 @@ prepare() {
 
 	cat "$srcdir/smaller-adwaita.css" >> "theme/Adwaita/gtk-contained.css"
 	cat "$srcdir/smaller-adwaita.css" >> "theme/Adwaita/gtk-contained-dark.css"
+	cat "$srcdir/smaller-adwaita.css" >> "theme/HighContrast/gtk-contained.css"
+	cat "$srcdir/smaller-adwaita.css" >> "theme/HighContrast/gtk-contained-inverse.css"
 
 	cd "$srcdir/gtk-$pkgver"
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/README.md b/README.md
index b565ae3ab8b0..4d33d7b78d55 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ File chooser
 
 * Annoying single-click "feature" in file list is disabled. You always have to double-click to choose file from list.
 * Typeahead feature is restored. Recursive file search will not be ran when you start typing.
+* Current working directory is opened by default instead of section with recently used files.
 * "Other locations" button is removed from places sidebar. All mounted devices and drives are accessible directly.
 * File system button in places sidebar is labeled as "File System" instead of "Computer".
 * Trash and XDG user directories (like Pictures, Downloads, Documents) are removed from places sidebar. They can be added as bookmarks.
@@ -37,12 +38,16 @@ Icons
 Others
 ---
 
-* Default Adwaita theme has smaller controls (buttons, fields, tabs, etc.).
 * Status bars are smaller regardless of used theme.
 * Scrollbars are always visible. Environment variable is not needed.
 * Delay before showing mnemonics is removed. You do not have to wait.
 * Menus of menu buttons are displayed as classic menu by default instead of popover.
-* Recently opened files feature is disabled by default.
+
+Themes
+---
+
+* Default Adwaita theme has smaller controls (buttons, fields, tabs, etc.).
+* Dark Adwaita and HighContrast themes also have reduced controls.
 
 --------
 
diff --git a/p__file-chooser__cwd-default.patch b/p__file-chooser__cwd-default.patch
new file mode 100644
index 000000000000..bb882277e1e8
--- /dev/null
+++ b/p__file-chooser__cwd-default.patch
@@ -0,0 +1,26 @@
+diff -U 10 -r -Z -B ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml
+--- ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-05-11 21:09:33.000000000 +0200
++++ ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-06-20 22:14:05.590256118 +0200
+@@ -112,21 +112,21 @@
+       </description>
+     </key>
+     <key name='window-size' type='(ii)'>
+       <default>(-1, -1)</default>
+       <summary>Window size</summary>
+       <description>
+ 	The size (width, height) of the GtkFileChooserDialog's window, in pixels.
+       </description>
+     </key>
+     <key name='startup-mode' enum='org.gtk.Settings.FileChooser.StartupMode'>
+-      <default>'recent'</default>
++      <default>'cwd'</default>
+       <summary>Startup mode</summary>
+       <description>
+ 	Either "recent" or "cwd"; controls whether the file chooser
+ 	starts up showing the list of recently-used files, or the
+ 	contents of the current working directory.
+       </description>
+     </key>
+     <key name='sidebar-width' type='i'>
+       <default>148</default>
+       <summary>Sidebar width</summary>
diff --git a/p__file-chooser__places-sidebar.patch b/p__file-chooser__places-sidebar.patch
index 2708b5c4064c..e5e90cfa37a3 100644
--- a/p__file-chooser__places-sidebar.patch
+++ b/p__file-chooser__places-sidebar.patch
@@ -1,29 +1,3 @@
-diff -U 10 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-05-11 21:09:33.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-06-18 23:16:33.350844489 +0200
-@@ -3954,21 +3954,21 @@
- }
- 
- static gboolean
- recent_files_setting_is_enabled (GtkFileChooserWidget *impl)
- {
-   GtkSettings *settings;
-   gboolean enabled;
- 
-   settings = gtk_widget_get_settings (GTK_WIDGET (impl));
-   g_object_get (settings, "gtk-recent-files-enabled", &enabled, NULL);
--  return enabled;
-+  return FALSE;
- }
- 
- /* Sets the file chooser to showing Recent Files or $CWD, depending on the
-  * user’s settings.
-  */
- static void
- set_startup_mode (GtkFileChooserWidget *impl)
- {
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
-   GtkRevealerTransitionType revealer_transition;
 diff -U 10 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
 --- ./org/gtk/gtkplacessidebar.c	2017-05-11 21:09:33.000000000 +0200
 +++ ./mod/gtk/gtkplacessidebar.c	2017-06-18 23:15:17.254174052 +0200