commit 781cbe6fdf31372e8f3f6625c2d427ffa8f40452 Author: Michael Catanzaro Date: Tue Dec 27 18:33:35 2016 -0600 Prepare 3.20.6 NEWS | 8 ++++++++ configure.ac | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) commit 9d9a77022176566222365c6abc917f2a4bf11258 Author: Michael Catanzaro Date: Fri Dec 16 21:20:31 2016 -0600 uri-tester: process patterns synchronously at startup Currently the URI tester loads filters and patterns asynchronously, which is racy as it means ads will sometimes not be blocked when a new web process is loading its first page. Filter processing must always complete before the first resource is requested, so do it synchronously. This is already fixed in a better way on the master branch, so this commit is for GNOME 3.22 only. https://bugzilla.gnome.org/show_bug.cgi?id=775736 embed/web-extension/ephy-uri-tester.c | 110 +++++++++++----------------------- 1 file changed, 34 insertions(+), 76 deletions(-) commit a28e92f4a54d0adb65839d29cb27c0d5ff36a866 Author: Carlos Garcia Campos Date: Wed Dec 7 15:43:00 2016 +0100 Do not show the lock icon in the location entry for about:blank pages embed/ephy-web-view.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a29095f2b1da100c25ba3596811cddd34a7a2f9d Author: Michael Catanzaro Date: Sun Dec 18 10:56:07 2016 -0600 window: fix alt-left/right keyboard shortcuts The call to gdk_keymap_translate_keyboard_state doesn't seem to really do much here, except change the way we have to test for Ctrl+Shift+T by consuming GDK_SHIFT_MASK. In particular, the keyval returned is already the keyval in the key event, so that's not really doing anything for us. But this is what the GDK documentation tells us to do, so why not. The important change here, as shown in the GDK documentation, is to mask out all the modifiers except Ctrl/Shift/Mod1 so that we ignore virtual modifiers like Meta that we really don't want to see. This mostly but not completely fixes the bug where the alt-left/right shortcuts for back/forward stop working. It fixes the regression where these shortcuts stopped working after I introduced key event filtering. It *does not* fix the issue that was originally reported, which is that the shortcuts mysteriously stop working sometimes; it cannot fix that original bug, because the key event filtering was not added until a month after that bug was reported. Hence, I am not closing the issue here. Something seems to be wrong in either GTK+ or in mutter, as sometimes GTK+ apps stop receiving any input at all; it might or might not be related. https://bugzilla.gnome.org/show_bug.cgi?id=772437 src/ephy-window.c | 69 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 24 deletions(-) commit 8192d80eb64fcc83735fb7cfa795b69241b3d3a7 Author: Michael Catanzaro Date: Tue Nov 22 18:38:01 2016 -0600 window: Fix key event state comparisons GDK can set random bits in the state to indicate internal stuff. We have to use GDK_MODIFIER_MASK to mask out its reserved values before trying to look at the state. https://bugzilla.gnome.org/show_bug.cgi?id=772437 src/ephy-window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 082af6d8db86e1c3574e82bc5b0e4c98e7bc8751 Author: Michael Catanzaro Date: Tue Nov 22 07:53:32 2016 -0600 window: Add alt-left/right to key event blacklist Seems WebKit always handles these key combinations, breaking our back/forward shortcuts. src/ephy-window.c | 4 ++++ 1 file changed, 4 insertions(+) commit 15b78a684643da588d9e46bf54976802d73ff614 Author: Michael Catanzaro Date: Mon Nov 21 18:44:03 2016 -0600 Fix incorrect NEWS entry NEWS | 1 - 1 file changed, 1 deletion(-)