Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
I guess there are probably conflicts here now. Although LP isn't saying so. -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/364362 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Review: Approve Looks reasonable. Only one note: (1) The change to clutter/clutter/clutter-device-manager.c is out of date already (missing https://gitlab.gnome.org/GNOME/mutter/merge_requests/552). So there is a slight risk without that second part. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/36 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1822846 in gnome-shell (Ubuntu): "Icon disappears from favorites in
gnome-shell 3.32 (upstream dock, not the ubuntu-dock)"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1822846
Bug #1826176 in gnome-shell (Ubuntu): "Applications do not receive focus in
Wayland sessions"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826176
Bug #1826936 in gnome-shell (Ubuntu): "Upgrade to 3.32.1 and SRU it"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826936
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/38
Update to 3.32.1
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/NEWS b/NEWS
index a86e5e4..fcfa060 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+3.32.1
+==
+* Fix avatar scaling on login screen [Florian; #1024]
+* Fix distortion of desktop zoom [Florian; #646]
+* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
+* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
+* Fix Alt+Esc switcher [Florian; #1064]
+* Respect struts for popover placement [Andrea; #1102]
+* Fix app icons updates after theme changes [Florian; #1117]
+* Fix desktop zoom after resolution changes [Marco; #1120]
+* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
+* Make World Clocks offsets relative to local time [Florian; #1157]
+* Fix top app icon disappearing from dash [Florian; #1053]
+* Update switch style to match new Adwaita [Jakub; !496]
+* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
+* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
+ Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
+ !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
+ !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
+
+Contributors:
+ AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
+ Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
+ Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
+
+Translators:
+ Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
+ Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
+ Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
+ Dušan Kazik [sk]
+
3.32.0
==
* Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]
diff --git a/data/dbus-interfaces/org.gnome.Shell.xml b/data/dbus-interfaces/org.gnome.Shell.xml
index 1fef302..094c294 100644
--- a/data/dbus-interfaces/org.gnome.Shell.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.xml
@@ -9,9 +9,6 @@
-
-
-
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index b778254..c05be6b 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -21,10 +21,8 @@
noise-texture.png
pad-osd.css
process-working.svg
-toggle-off-us.svg
toggle-off-intl.svg
toggle-off-hc.svg
-toggle-on-us.svg
toggle-on-intl.svg
toggle-on-hc.svg
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index c7485ae..a6357ba 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -157,18 +157,13 @@ StScrollBar {
/* Switches */
.toggle-switch {
- width: 65px;
+ width: 46px;
height: 22px;
background-size: contain;
+ background-image: url("resource:///org/gnome/shell/theme/toggle-off-intl.svg");
+ &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-intl.svg"); }
}
- @each $v in us, intl {
-.toggle-switch-#{$v} {
- background-image: url("resource:///org/gnome/shell/theme/toggle-off-#{$v}.svg");
- &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-#{$v}.svg"); }
-}
- }
-
/* links */
.shell-link {
color: $link_color;
@@ -1142,6 +1137,12 @@ StScrollBar {
.ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position
+// Rubberband for select-area screenshots
+.select-area-rubberband {
+ background-color: transparentize($selected_bg_color,0.7);
+ border: 1px solid $selected_bg_color;
+}
+
// not really top bar only
.popup-menu-arrow { icon-size: 1.09em; }
.popup-menu-icon { icon-size: 1.09em; }
diff --git a/data/theme/toggle-off-intl.svg b/data/theme/toggle-off-intl.svg
index a1734fb..cb08712 100644
--- a/data/theme/togg
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Conflict fixed. -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/364362 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
Review: Approve thanks! -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365984 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365920 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix-2 into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Review: Approve OK, thanks, it looks good and seems to work fine. I've added a debug so you can see on the console what locale is being set in accountsservice. -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365920 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1772811 in gnome-shell (Ubuntu): "[SRU] different behaviors for switch
display mode between xenial and bionic"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772811
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/366676
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 99219d6..76d6803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutter (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
+
+ * d/p/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch,
+d/p/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch:
+- Ensure switch display mode is cyclic (LP: #1772811)
+
+ -- Marco Trevisan (Treviño) Mon, 29 Apr 2019 23:29:24 -0500
+
mutter (3.28.3+git20190124-0ubuntu18.04.2) bionic; urgency=medium
* control: Add Breaks on budgie-desktop verions broken by this upload.
diff --git a/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch b/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
new file mode 100644
index 000..b8d12d5
--- /dev/null
+++ b/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Jonas_=C3=85dahl?=
+Date: Thu, 11 Oct 2018 15:16:26 +0200
+Subject: monitor-manager: Don't use switch-config when ensuring configuration
+
+Switch-configs are only to be used in certain circumstances (see
+meta_monitor_manager_can_switch_config()) so when ensuring
+configuration and attempting to create a linear configuration, use the
+linear configuration constructor function directly without going via the
+switch config method, otherwise we might incorrectly fall back to the
+fallback configuration (only enable primary monitor).
+
+This is a regression introduced by 6267732bec97773.
+
+Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/342
+
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1772811
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/262
+Applied-Upstream: yes, 3.32.0
+---
+ src/backends/meta-monitor-manager.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
+index 96d794a..fecbfda 100644
+--- a/src/backends/meta-monitor-manager.c
b/src/backends/meta-monitor-manager.c
+@@ -582,9 +582,7 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
+ g_clear_object (&config);
+ }
+
+- config =
+-meta_monitor_config_manager_create_for_switch_config (manager->config_manager,
+- META_MONITOR_SWITCH_CONFIG_ALL_LINEAR);
++ config = meta_monitor_config_manager_create_linear (manager->config_manager);
+ if (config)
+ {
+ if (!meta_monitor_manager_apply_monitors_config (manager,
diff --git a/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch b/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch
new file mode 100644
index 000..780ba05
--- /dev/null
+++ b/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch
@@ -0,0 +1,198 @@
+From: Daniel Drake
+Date: Thu, 30 Aug 2018 08:34:53 +0800
+Subject: monitor-manager: use MonitorsConfig to track switch_config
+
+When constructing MetaMonitorsConfig objects, store which type
+of switch_config they are for (or UNKNOWN if it is not such
+type of config).
+
+Stop unconditionally setting current_switch_config to UNKNOWN when
+handling monitors changed events. Instead, set it to the switch_config
+type stored in the MonitorsConfig in the codepath that updates logical
+state. In addition to being called in the hotplug case along the same
+code flow that generates monitors changed events, this is also called
+in the coldplug case where a secondary monitor was connected before
+mutter was started.
+
+When creating the default linear display config, create it as a
+switch_config so that internal state gets updated to represent
+linear mode when this config is used.
+
+The previous behaviour of unconditionally resetting current_switch_config
+to UNKNOWN was breaking the internal state machine for display config
+switching, causing misbehaviour in gnome-shell's switchMonitor UI when
+using display switch hotkeys. The lack of internal tracking when the
+displays are already in the default "Join Displays" linear mode was
+then causing the first display switch hotkey press to do nothing
+(it would attempt to select "Join Displays"
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365984 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Status should be "Merged" now. It looks like it's already merged. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362055 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Approve
I'm not directly familiar with recent changes to gnome-shell 3.32.1. It looks
reasonable, except:
(1) Again I recommend not including the large section in changelog entries
detailing what hasn't changed ("remaining changes:") because it is misleading
to document in detail things that are not part of the update.
--
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/38
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1826176 in gnome-shell (Ubuntu): "Applications do not receive focus in
Wayland sessions"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826176
Bug #1826182 in mutter (Ubuntu): "[DisplayLink][fixed upstream] GNOME
libmutter crash on hotplugging a dock with a monitor"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1826182
Bug #1826933 in gnome-shell (Ubuntu): "gnome-shell crashes in
meta_monitor_mode_get_resolution -> calculate_scale ->
meta_monitor_calculate_mode_scale derive_calculated_global_scale ->
meta_monitor_manager_rebuild_logical_monitors_derived"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826933
Bug #1826936 in gnome-shell (Ubuntu): "Upgrade to 3.32.1 and SRU it"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826936
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/36
Merge 3.32 with debian, fix scale computation crash.
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
diff --git a/NEWS b/NEWS
index 720e28d..5606ee4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+3.32.1
+==
+* Fix fallback app menu on wayland [Florian; #493]
+* Fix elogind support [Tom; !491]
+* Fix startup notifications not timing out [Carlos; #501]
+* Fix keyboard accessibility toggle from keys
+ [Olivier, Carlos; !501, #529, !531]
+* Fix touchscreen input on rotated displays [Carlos; #514]
+* Work around hangul text input bug [Carlos; #1365]
+* Fix blurry wallpaper scaling [Daniel; !505]
+* Fix placement of window menu when using fractional scaling [Jan; #527]
+* Fix repaint issues of offscreen effects on secondary monitors [Daniel; !511]
+* Fix windows not getting focus after launch [Daniel; #505]
+* Properly advertise support for 'underscan' property [Jonas; !507]
+* Improve power-saving handling [Jonas; !506]
+* Fix moving windows by super+touch [Jonas D.; !495]
+* Misc. bug fixes and cleanups [Benjamin, Florian, Adam, Marco, Pablo,
+ Erik, Jonas, Heiher, Pekka, Daniel, Olivier, Carlos; !478, !475, !480,
+ !482, #490, !488, #491, #480, !477, !496, !492, !485, !515, !519, !521,
+ !216, !538, #541, #523]
+
+Contributors:
+ Jonas Ådahl, Pablo Barciela, Benjamin Berg, Tom Briden, Jonas Dreßler,
+ Olivier Fourdan, Carlos Garnacho, Jan Alexander Steffens (heftig), Heiher,
+ Adam Jackson, Erik Kurzinger, Florian Müllner, Pekka Paalanen,
+ Marco Trevisan (Treviño), Daniel van Vugt
+
+Translators:
+ Khaled Hosny [ar], Goran Vidović [hr], Daniel Mustieles [es]
+
3.32.0
==
* Fix deadlock when cancelling a theme sound [Andrea; !474]
diff --git a/clutter/clutter/clutter-device-manager.c b/clutter/clutter/clutter-device-manager.c
index 1800d01..c676384 100644
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -550,13 +550,7 @@ static gboolean
are_kbd_a11y_settings_equal (ClutterKbdA11ySettings *a,
ClutterKbdA11ySettings *b)
{
- return (a->controls == b->controls &&
- a->slowkeys_delay == b->slowkeys_delay &&
- a->debounce_delay == b->debounce_delay &&
- a->timeout_delay == b->timeout_delay &&
- a->mousekeys_init_delay == b->mousekeys_init_delay &&
- a->mousekeys_max_speed == b->mousekeys_max_speed &&
- a->mousekeys_accel_time == b->mousekeys_accel_time);
+ return (memcmp (a, b, sizeof (ClutterKbdA11ySettings)) == 0);
}
void
diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c
index b52689e..2ac2e11 100644
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
@@ -1132,13 +1132,13 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent *e
if (event->key.flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)
goto emit_event;
- if (!(device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED))
-goto emit_event;
-
- if (event->type == CLUTTER_KEY_PRESS)
-handle_enablekeys_press (event, device_evdev);
- else
-handle_enablekeys_release (event, device_evdev);
+ if (device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
+{
+ if (event->type == CLUTTER_KEY_PRESS)
+handle_enablekeys_press (event, device_evdev);
+ else
+handle_enablekeys_release (event, device_evdev);
+}
if (device_evdev->a11y_flags & CLUTTER_A11Y_MOUSE_KEYS_ENABLED)
{
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index 2623d02..235cfe8 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
