Patch updated.

- "no-at-bridge" patch renamed to "atk-bridge-errors". Currently it's possible to use Orca reader or other assistive technologies with my
patch. ATK bridge integration isn't disabled, errors are hidden.
- Classic context menu instead of popovers is used in menu buttons only if GTK_CSD environment variable is other than "1".

6 files changed, 27 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bfbaf486c5d..381e92536398 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 library with my modifications (see README).
 	pkgver = 3.22.21
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gtk.org/
 	arch = i686
 	arch = x86_64
@@ -44,7 +44,7 @@ pkgbase = gtk3-mushrooms
 	source = file-chooser__places-sidebar.patch
 	source = file-chooser__single-click.patch
 	source = file-chooser__typeahead.patch
-	source = fixes__no-at-bridge.patch
+	source = fixes__atk-bridge-errors.patch
 	source = fixes__window-background.patch
 	source = icons__buttons.patch
 	source = icons__context-menus.patch
@@ -70,7 +70,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb
 	sha256sums = 9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9
 	sha256sums = fdc2c3d63c0fc94934c10a99189062955e8f40acd3bb883b739faefa86344c1f
-	sha256sums = 103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c
+	sha256sums = dcbdf52343748b7af621e98bf12d8c76097e0eb98ef02f594f95eefc5ae72575
 	sha256sums = 4917fcb99dfe189f0f834a143bf85abb77f9ac0b8ec7a881aa4c8c1b897f6524
 	sha256sums = 769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4
 	sha256sums = a2af0c7f29e9ae5e2a669f4ad131acab8d5cbd5d47cc3914750db25b8eeefe1e
@@ -80,7 +80,7 @@ pkgbase = gtk3-mushrooms
 	sha256sums = fa069d6ac463e5759e0073bb623ce3b495bd7a074bb13dbc25a12b7ce46f2024
 	sha256sums = 64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace
 	sha256sums = e8d53849a3277fa0f0f729be2197970f28cd809070021d2f5ae1987df8250171
-	sha256sums = ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851
+	sha256sums = 4a239fb3f4dc128a64198ce9bcb9c4643541e366fd3fe19dfb45d23711727e18
 	sha256sums = a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb
 	sha256sums = b479fe0a82db21475fde30d9daad4360552b67957479773a1216058c7ff46629
 	sha256sums = 23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41
diff --git a/PKGBUILD b/PKGBUILD
index 8479e9fdb4dd..4ec6d85bd842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ __arch_pkg_commit="712b5a879d9389efba706c8817607fa65ac562e9"
 
 pkgname=gtk3-mushrooms
 pkgver=3.22.21
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK3 library with my modifications (see README)."
 url="http://www.gtk.org/"
 conflicts=(gtk3)
@@ -38,7 +38,7 @@ source=(
 	"file-chooser__places-sidebar.patch"
 	"file-chooser__single-click.patch"
 	"file-chooser__typeahead.patch"
-	"fixes__no-at-bridge.patch"
+	"fixes__atk-bridge-errors.patch"
 	"fixes__window-background.patch"
 	"icons__buttons.patch"
 	"icons__context-menus.patch"
@@ -73,7 +73,7 @@ sha256sums=(
 	'4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb'
 	'9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9'
 	'fdc2c3d63c0fc94934c10a99189062955e8f40acd3bb883b739faefa86344c1f'
-	'103f86c0f03a1c210a56a44434c19b9f64f8c376bcead689a04919b26b0f4d4c'
+	'dcbdf52343748b7af621e98bf12d8c76097e0eb98ef02f594f95eefc5ae72575'
 	'4917fcb99dfe189f0f834a143bf85abb77f9ac0b8ec7a881aa4c8c1b897f6524'
 	'769ad0e70a6ac01c203417e50f06d64dbc9fd260707abf5289642ca5a4d4e7f4'
 	'a2af0c7f29e9ae5e2a669f4ad131acab8d5cbd5d47cc3914750db25b8eeefe1e'
@@ -83,7 +83,7 @@ sha256sums=(
 	'fa069d6ac463e5759e0073bb623ce3b495bd7a074bb13dbc25a12b7ce46f2024'
 	'64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace'
 	'e8d53849a3277fa0f0f729be2197970f28cd809070021d2f5ae1987df8250171'
-	'ae3da3618e294dace5a2459a9e3bfaa3bd50be034449eec2828eaa2e217ce851'
+	'4a239fb3f4dc128a64198ce9bcb9c4643541e366fd3fe19dfb45d23711727e18'
 	'a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb'
 	'b479fe0a82db21475fde30d9daad4360552b67957479773a1216058c7ff46629'
 	'23cdd8b8034e73bb852d42feaabf4f995983a032be479d9ce84e5858c0bd5c41'
diff --git a/README.md b/README.md
index edce38691c9c..c2949afd8afd 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Fixes
 ---
 
 * Window background is set properly to theme background color instead of solid black. See https://bugzilla.gnome.org/show_bug.cgi?id=771708.
-* Integration with Accessibility Toolkit is disabled by default to avoid errors in console output. See https://unix.stackexchange.com/questions/230238. **Important: if you are using assistive technologies (such as Orca reader) you must restore default GTK behavior by setting `NO_AT_BRIDGE=0` environment variable.**
+* Errors in console output about disabled integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238.
 
 Adwaita theme
 ---
diff --git a/fixes__atk-bridge-errors.patch b/fixes__atk-bridge-errors.patch
new file mode 100644
index 000000000000..23ea58b757c0
--- /dev/null
+++ b/fixes__atk-bridge-errors.patch
@@ -0,0 +1,17 @@
+diff -U 5 -r -Z -B ./org/gtk/a11y/gtkaccessibility.c ./mod/gtk/a11y/gtkaccessibility.c
+--- ./org/gtk/a11y/gtkaccessibility.c	2017-08-11 21:47:18.000000000 +0200
++++ ./mod/gtk/a11y/gtkaccessibility.c	2017-09-17 19:10:42.210314169 +0200
+@@ -987,10 +987,13 @@
+ 
+   _gtk_accessibility_override_atk_util ();
+   do_window_event_initialization ();
+ 
+ #ifdef GDK_WINDOWING_X11
++  GLogWriterOutput h_null_writer () { return G_LOG_WRITER_HANDLED; }
++  g_log_set_writer_func(h_null_writer, NULL, NULL);
+   atk_bridge_adaptor_init (NULL, NULL);
++  g_log_set_writer_func(g_log_writer_default, NULL, NULL);
+ #endif
+ 
+   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ }
diff --git a/fixes__no-at-bridge.patch b/fixes__no-at-bridge.patch
deleted file mode 100644
index 43c570a80895..000000000000
--- a/fixes__no-at-bridge.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -U 5 -r -Z -B ./org/gtk/a11y/gtkaccessibility.c ./mod/gtk/a11y/gtkaccessibility.c
---- ./org/gtk/a11y/gtkaccessibility.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/a11y/gtkaccessibility.c	2017-07-30 15:59:40.130141936 +0200
-@@ -987,10 +987,11 @@
- 
-   _gtk_accessibility_override_atk_util ();
-   do_window_event_initialization ();
- 
- #ifdef GDK_WINDOWING_X11
-+  if (g_getenv("NO_AT_BRIDGE") == FALSE) return;
-   atk_bridge_adaptor_init (NULL, NULL);
- #endif
- 
-   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
- }
diff --git a/popovers__menu-button.patch b/popovers__menu-button.patch
index abfbc6045e4c..0e888278087d 100644
--- a/popovers__menu-button.patch
+++ b/popovers__menu-button.patch
@@ -8,7 +8,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkmenubutton.c ./mod/gtk/gtkmenubutton.c
    if (menu_model)
      {
 -      if (priv->use_popover)
-+      if (FALSE && priv->use_popover)
++      if (g_strcmp0(g_getenv("GTK_CSD"), "1") == 0 && priv->use_popover)
          {
            GtkWidget *popover;