commit 36903a126863e58b2be96bb3c74e7ecfd2352105 Author: Michael Catanzaro Date: Tue Dec 27 18:39:30 2016 -0600 Prepare 3.18.10 NEWS | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) commit e2682919393143088a4e0475fd33b7618d686a97 Author: Michael Catanzaro Date: Sun Dec 18 12:01:35 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 backports only. https://bugzilla.gnome.org/show_bug.cgi?id=775736 embed/web-extension/uri-tester.c | 111 ++++++++++++--------------------------- 1 file changed, 34 insertions(+), 77 deletions(-) commit 162fd89e99f7a00fa88a536d33924d3e22245ec5 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 | 74 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 28 deletions(-) commit 41794b089c1b0fa4d8fc7946efd96df4be8af74f 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit d43cb5b43f118c8b1f4b4b45b636716b9af83ac5 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(+)