739.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From 4411d9db6ee6112f987fac8469a2cc617f4f9b6c Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
  3. Date: Fri, 20 Sep 2019 21:08:45 +0200
  4. Subject: [PATCH] shellDBus: Don't assume devices have a node
  5. Clutter.InputDevice.get_device_node() may return null. Handle that
  6. case when building the 'AcceleratorActivated' vardict parameter.
  7. https://gitlab.gnome.org/GNOME/gnome-shell/issues/1641
  8. ---
  9. js/ui/shellDBus.js | 6 +++++-
  10. 1 file changed, 5 insertions(+), 1 deletion(-)
  11. diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
  12. index e750c207f9..fca0b64255 100644
  13. --- a/js/ui/shellDBus.js
  14. +++ b/js/ui/shellDBus.js
  15. @@ -151,9 +151,13 @@ var GnomeShell = class {
  16. let connection = this._dbusImpl.get_connection();
  17. let info = this._dbusImpl.get_info();
  18. let params = { 'device-id': GLib.Variant.new('u', device.get_device_id()),
  19. - 'device-node': GLib.Variant.new('s', device.get_device_node()),
  20. 'timestamp': GLib.Variant.new('u', timestamp),
  21. 'action-mode': GLib.Variant.new('u', Main.actionMode) };
  22. +
  23. + let deviceNode = device.get_device_node();
  24. + if (deviceNode)
  25. + params['device-node'] = GLib.Variant.new('s', deviceNode);
  26. +
  27. connection.emit_signal(destination,
  28. this._dbusImpl.get_object_path(),
  29. info ? info.name : null,
  30. --
  31. 2.22.0