Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-08-12 10:29:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-desktop" Wed Aug 12 10:29:20 2020 rev:2 rq:825762 version:10.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-08-10 15:02:25.948140959 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-08-12 10:32:36.488155509 +0200 @@ -1,0 +2,28 @@ +Tue Aug 11 10:39:42 UTC 2020 - Callum Farmer <[email protected]> + +- Remove gnome-session dependency + +------------------------------------------------------------------- +Mon Aug 10 20:02:33 UTC 2020 - Callum Farmer <[email protected]> + +- Fix desktop icons + +------------------------------------------------------------------- +Mon Aug 10 19:15:07 UTC 2020 - Callum Farmer <[email protected]> + +- Add patches: + * Rework-grab-and-ungrab-keys.patch (gh#solus-project/budgie-desktop#1907) + * mutter-3-35-91.patch (gh#solus-project/budgie-desktop#1939) + * gnome-coexistance.patch (gh#solus-project/budgie-desktop#1984) +- Remove old %post and %postun +- Add new Requires: + * ibus + * typelib-1_0-PeasGtk-1_0 + * typelib-1_0-Budgie-1_0 + +------------------------------------------------------------------- +Mon Aug 10 14:27:48 UTC 2020 - Callum Farmer <[email protected]> + +- Add xsession update-alternatives + +------------------------------------------------------------------- New: ---- Rework-grab-and-ungrab-keys.patch gnome-coexistance.patch mutter-3-35-91.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-desktop.spec ++++++ --- /var/tmp/diff_new_pack.mvAmiz/_old 2020-08-12 10:32:42.256159963 +0200 +++ /var/tmp/diff_new_pack.mvAmiz/_new 2020-08-12 10:32:42.256159963 +0200 @@ -29,6 +29,12 @@ Source2: %{name}.keyring # PATCH-FIX-UPSTREAM: Add support for mutter 3.36 gh#solus-project/budgie-desktop#1918 Patch: support-libmutter6.patch +# PATCH-FIX-UPSTREAM: Resolve losing keyboard shortcuts on login gh#solus-project/budgie-desktop#1907 +Patch1: Rework-grab-and-ungrab-keys.patch +# PATCH-FIX-UPSTREAM: Add support for mutter 3.35.91 gh#solus-project/budgie-desktop#1939 +Patch2: mutter-3-35-91.patch +# PATCH-FIX-UPSTREAM: Allow budgie-desktop and gnome-shell to coexist gh#solus-project/budgie-desktop#1984 +Patch3: gnome-coexistance.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -52,7 +58,9 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) >= 0.28 -Requires: gnome-session +Requires: typelib-1_0-PeasGtk-1_0 +Requires: typelib-1_0-Budgie-1_0 +Requires: ibus Requires: gnome-settings-daemon #Recommends: gnome-screensaver Recommends: NetworkManager-applet @@ -131,7 +139,7 @@ %autosetup -p1 %build -%meson +%meson -Dwith-desktop-icons=none %meson_build %install @@ -146,17 +154,19 @@ mv %{buildroot}%{_datadir}/vala/* %{buildroot}%{_datadir}/vala-%{vala_version}/ rm -Rf %{buildroot}%{_datadir}/vala/ +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop +ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + %find_lang %{name} -%if 0%{?suse_version} < 1500 %post -%glib2_gsettings_schema_post -%icon_theme_cache_post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/budgie-desktop.desktop 20 %postun -%glib2_gsettings_schema_post -%icon_theme_cache_postun -%endif +[ -f %{_datadir}/xsessions/budgie-desktop.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/budgie-desktop.desktop %post -n libraven0 -p /sbin/ldconfig %postun -n libraven0 -p /sbin/ldconfig @@ -177,9 +187,11 @@ %{_datadir}/glib-2.0/schemas/20_solus-project.budgie.wm.gschema.override %{_datadir}/gnome-session/sessions/budgie-desktop.session %{_datadir}/icons/hicolor/scalable/*/*.svg +%{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/budgie-desktop.desktop %{_libdir}/budgie-desktop/ %{_sysconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %files -n libraven0 %{_libdir}/libraven.so.* ++++++ Rework-grab-and-ungrab-keys.patch ++++++ >From 05b4694887fd072316470c570fbe4b4257a5f4f3 Mon Sep 17 00:00:00 2001 From: David Mohammed <[email protected]> Date: Sun, 3 Nov 2019 21:37:34 +0000 Subject: [PATCH 1/3] Rework grab and ungrab keys --- src/wm/shim.vala | 96 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/src/wm/shim.vala b/src/wm/shim.vala index 4cdfa0b0..44d6fc60 100644 --- a/src/wm/shim.vala +++ b/src/wm/shim.vala @@ -138,7 +138,7 @@ public interface BudgieOSD : GLib.Object public class ShellShim : GLib.Object { - HashTable<uint,string> grabs; + HashTable<string, uint?> grabs; HashTable<string,uint> watches; unowned Meta.Display? display; @@ -150,7 +150,7 @@ public class ShellShim : GLib.Object [DBus (visible = false)] public ShellShim(Budgie.BudgieWM? wm) { - grabs = new HashTable<uint,string>(direct_hash, direct_equal); + grabs = new HashTable<string, uint?> (str_hash, str_equal); watches = new HashTable<string,uint>(str_hash, str_equal); display = wm.get_display(); @@ -193,6 +193,7 @@ public class ShellShim : GLib.Object osd_proxy = null; } +/* #if HAVE_MUTTER_5 private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint device_id) #else @@ -207,8 +208,30 @@ public class ShellShim : GLib.Object this.accelerator_activated(action, params); } +*/ + +#if HAVE_MUTTER_5 + private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint device_id) +#else + private void on_accelerator_activated(uint action, uint device_id, timestamp) +#endif + { + print("on accelerator activated"); + foreach (string accelerator in grabs.get_keys ()) { + if (grabs[accelerator] == action) { + var params = new GLib.HashTable<string, Variant> (null, null); + params.set ("device-id", new Variant.uint32 (device_id)); +#if HAV_MUTTER_5 + params.set ("timestamp", new Variant.uint32 (timestamp)); +#else + params.set ("timestamp", new Variant.uint32 (0)); +#endif + this.accelerator_activated (action, params); + } + } + } - void on_disappeared(DBusConnection conn, string name) + /*void on_disappeared(DBusConnection conn, string name) { unowned string val; unowned uint key; @@ -226,10 +249,55 @@ public class ShellShim : GLib.Object continue; } display.ungrab_accelerator(key); - grabs.remove(key); + iter.remove(); } } + */ + public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags) throws DBusError, IOError + { + print("grab accelertor"); + uint? action = grabs[accelerator]; + + if (action == null) { + action = display.grab_accelerator (accelerator, flags); + if (action > 0) { + grabs[accelerator] = action; + } + } + + return action; + } + + public uint[] grab_accelerators (GsdAccel[] accelerators) throws DBusError, IOError + { + print("grab accelerators"); + uint[] actions = {}; + + foreach (unowned GsdAccel? accelerator in accelerators) { + actions += grab_accelerator (accelerator.accelerator, accelerator.grab_flags); + } + + return actions; + } + + public bool ungrab_accelerator (uint action) throws DBusError, IOError + { + print("ungrab accelerator"); + bool ret = false; + + foreach (unowned string accelerator in grabs.get_keys ()) { + if (grabs[accelerator] == action) { + ret = display.ungrab_accelerator (action); + grabs.remove (accelerator); + break; + } + } + + return ret; + } + +/* #if HAVE_GSD_332 private uint _grab(string sender, string seq, uint flag, Meta.KeyBindingFlags grab_flags) { @@ -254,7 +322,7 @@ public class ShellShim : GLib.Object return ret; } - +*/ void on_bus_acquired(DBusConnection conn) { try { @@ -273,6 +341,22 @@ public class ShellShim : GLib.Object on_bus_acquired, null, null); } + public uint GrabAccelerator(BusName sender, string accelerator, uint flags, Meta.KeyBindingFlags grab_flags) + { + return grab_accelerator(accelerator, grab_flags); + } + + public uint[] GrabAccelerators(BusName sender, GsdAccel[] accelerators) + { + return grab_accelerators(accelerators); + } + + public bool UngrabAccelerator(BusName sender, uint action) + { + return ungrab_accelerator (action); + } + +/* #if HAVE_GSD_332 public uint GrabAccelerator(BusName sender, string accelerator, uint flags, Meta.KeyBindingFlags grab_flags) { @@ -302,6 +386,7 @@ public class ShellShim : GLib.Object return t; } #endif + public bool ungrab_accelerator(BusName sender, uint action) { if (display.ungrab_accelerator(action)) { @@ -310,6 +395,7 @@ public class ShellShim : GLib.Object } return false; } + */ /** * Show the OSD when requested. >From 59febfcc48d82ff40c2e0fc9bcf909c3380a5351 Mon Sep 17 00:00:00 2001 From: David Mohammed <[email protected]> Date: Thu, 28 Nov 2019 20:58:21 +0000 Subject: [PATCH 2/3] Cleanup code, remove unneeded watches --- src/wm/shim.vala | 117 +---------------------------------------------- 1 file changed, 2 insertions(+), 115 deletions(-) diff --git a/src/wm/shim.vala b/src/wm/shim.vala index 44d6fc60..432458ca 100644 --- a/src/wm/shim.vala +++ b/src/wm/shim.vala @@ -139,7 +139,6 @@ public class ShellShim : GLib.Object { HashTable<string, uint?> grabs; - HashTable<string,uint> watches; unowned Meta.Display? display; private SessionHandler? handler = null; @@ -151,7 +150,6 @@ public class ShellShim : GLib.Object public ShellShim(Budgie.BudgieWM? wm) { grabs = new HashTable<string, uint?> (str_hash, str_equal); - watches = new HashTable<string,uint>(str_hash, str_equal); display = wm.get_display(); display.accelerator_activated.connect(on_accelerator_activated); @@ -193,30 +191,12 @@ public class ShellShim : GLib.Object osd_proxy = null; } -/* -#if HAVE_MUTTER_5 - private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint device_id) -#else - private void on_accelerator_activated(uint action, uint device_id) -#endif - { - HashTable<string,Variant> params = new HashTable<string,Variant>(str_hash, str_equal); - - params.insert("device-id", device_id); - params.insert("timestamp", new Variant.uint32(0)); - params.insert("action-mode", new Variant.uint32(0)); - - this.accelerator_activated(action, params); - } -*/ - #if HAVE_MUTTER_5 private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint device_id) #else private void on_accelerator_activated(uint action, uint device_id, timestamp) #endif { - print("on accelerator activated"); foreach (string accelerator in grabs.get_keys ()) { if (grabs[accelerator] == action) { var params = new GLib.HashTable<string, Variant> (null, null); @@ -231,32 +211,8 @@ public class ShellShim : GLib.Object } } - /*void on_disappeared(DBusConnection conn, string name) - { - unowned string val; - unowned uint key; - - if (!watches.contains(name)) { - return; - } - - uint id = watches.lookup(name); - Bus.unwatch_name(id); - - var iter = HashTableIter<uint,string>(grabs); - while (iter.next(out key, out val)) { - if (val != name) { - continue; - } - display.ungrab_accelerator(key); - iter.remove(); - } - } - */ - public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags) throws DBusError, IOError { - print("grab accelertor"); uint? action = grabs[accelerator]; if (action == null) { @@ -271,7 +227,6 @@ public class ShellShim : GLib.Object public uint[] grab_accelerators (GsdAccel[] accelerators) throws DBusError, IOError { - print("grab accelerators"); uint[] actions = {}; foreach (unowned GsdAccel? accelerator in accelerators) { @@ -283,10 +238,9 @@ public class ShellShim : GLib.Object public bool ungrab_accelerator (uint action) throws DBusError, IOError { - print("ungrab accelerator"); bool ret = false; - - foreach (unowned string accelerator in grabs.get_keys ()) { + var keys = grabs.get_keys(); + foreach (unowned string accelerator in keys) { if (grabs[accelerator] == action) { ret = display.ungrab_accelerator (action); grabs.remove (accelerator); @@ -297,32 +251,6 @@ public class ShellShim : GLib.Object return ret; } -/* -#if HAVE_GSD_332 - private uint _grab(string sender, string seq, uint flag, Meta.KeyBindingFlags grab_flags) - { - var ret = display.grab_accelerator(seq, grab_flags); -#else - private uint _grab(string sender, string seq, uint flag) - { - var ret = display.grab_accelerator(seq); -#endif - - if (ret == Meta.KeyBindingAction.NONE) { - return ret; - } - - grabs.insert(ret, sender); - - if (!watches.contains(sender)) { - var id = Bus.watch_name(BusType.SESSION, sender, BusNameWatcherFlags.NONE, - null, on_disappeared); - watches.insert(sender, id); - } - - return ret; - } -*/ void on_bus_acquired(DBusConnection conn) { try { @@ -356,47 +284,6 @@ public class ShellShim : GLib.Object return ungrab_accelerator (action); } -/* -#if HAVE_GSD_332 - public uint GrabAccelerator(BusName sender, string accelerator, uint flags, Meta.KeyBindingFlags grab_flags) - { - return _grab(sender, accelerator, flags, grab_flags); - } - - public uint[] GrabAccelerators(BusName sender, GsdAccel[] accelerators) - { - uint[] t = { }; - foreach (var a in accelerators) { - t += _grab(sender, a.accelerator, a.flags, a.grab_flags); - } - return t; - } -#else - public uint GrabAccelerator(BusName sender, string accelerator, uint flags) - { - return _grab(sender, accelerator, flags); - } - - public uint[] GrabAccelerators(BusName sender, GsdAccel[] accelerators) - { - uint[] t = { }; - foreach (var a in accelerators) { - t += _grab(sender, a.accelerator, a.flags); - } - return t; - } -#endif - - public bool ungrab_accelerator(BusName sender, uint action) - { - if (display.ungrab_accelerator(action)) { - grabs.remove(action); - return true; - } - return false; - } - */ - /** * Show the OSD when requested. */ >From b812847a898193d475ab68738d78bfb75b6a3692 Mon Sep 17 00:00:00 2001 From: David Mohammed <[email protected]> Date: Mon, 30 Dec 2019 15:32:10 +0000 Subject: [PATCH 3/3] Implement UngrabAccelerators This is a specific mutter-5 dbus call that needs to be implemented to ensure shortcuts can be set/unset and reset again Additionally add missing mutter-5 parameters for calling this meta accelerator_activated signal --- src/wm/shim.vala | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/wm/shim.vala b/src/wm/shim.vala index 432458ca..d465d469 100644 --- a/src/wm/shim.vala +++ b/src/wm/shim.vala @@ -192,7 +192,7 @@ public class ShellShim : GLib.Object } #if HAVE_MUTTER_5 - private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint device_id) + private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint timestamp) #else private void on_accelerator_activated(uint action, uint device_id, timestamp) #endif @@ -200,12 +200,14 @@ public class ShellShim : GLib.Object foreach (string accelerator in grabs.get_keys ()) { if (grabs[accelerator] == action) { var params = new GLib.HashTable<string, Variant> (null, null); - params.set ("device-id", new Variant.uint32 (device_id)); -#if HAV_MUTTER_5 - params.set ("timestamp", new Variant.uint32 (timestamp)); +#if HAVE_MUTTER_5 + params.set ("device-id", new Variant.uint32 (dev.id)); + params.set ("action-mode", new Variant.uint32 (action)); + params.set ("device-mode", new Variant.string (dev.get_device_node())); #else - params.set ("timestamp", new Variant.uint32 (0)); + params.set ("device-id", new Variant.uint32 (device_id)); #endif + params.set ("timestamp", new Variant.uint32 (timestamp)); this.accelerator_activated (action, params); } } @@ -284,6 +286,16 @@ public class ShellShim : GLib.Object return ungrab_accelerator (action); } +#if HAVE_MUTTER_5 + public bool UngrabAccelerators(BusName sender, uint[] actions) + { + foreach (uint action in actions) { + ungrab_accelerator (action); + } + return true; + } +#endif + /** * Show the OSD when requested. */ ++++++ gnome-coexistance.patch ++++++ >From 0f4b354eebef80c70d985fa7d7837d783cdd0cb7 Mon Sep 17 00:00:00 2001 From: David Mohammed <[email protected]> Date: Mon, 25 May 2020 14:59:10 +0100 Subject: [PATCH] Allow budgie-desktop and gnome-shell to coexist --- src/session/budgie-desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session/budgie-desktop.in b/src/session/budgie-desktop.in index 45a15141..6e1c963e 100755 --- a/src/session/budgie-desktop.in +++ b/src/session/budgie-desktop.in @@ -13,4 +13,4 @@ if [ -z $XDG_CURRENT_DESKTOP ]; then export XDG_CURRENT_DESKTOP fi -exec gnome-session --session=budgie-desktop $* +exec gnome-session --builtin --session=budgie-desktop $* ++++++ mutter-3-35-91.patch ++++++ >From a2a58cba28c7d70d0e6b9bccaf046e735f391f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <[email protected]> Date: Thu, 20 Feb 2020 14:06:09 +0100 Subject: [PATCH 1/2] vapi: Sync mutter-6 VAPI to 3.35.91 --- vapi/libmutter-6.vapi | 1 - vapi/mutter-clutter-6.vapi | 2 ++ vapi/mutter-cogl-6.vapi | 9 --------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/vapi/libmutter-6.vapi b/vapi/libmutter-6.vapi index 31f4801c..b36be1b7 100644 --- a/vapi/libmutter-6.vapi +++ b/vapi/libmutter-6.vapi @@ -368,7 +368,6 @@ namespace Meta { public uint add_idle_watch (uint64 interval_msec, owned Meta.IdleMonitorWatchFunc? callback); public uint add_user_active_watch (owned Meta.IdleMonitorWatchFunc? callback); public static unowned Meta.IdleMonitor get_core (); - public static unowned Meta.IdleMonitor get_for_device (Clutter.InputDevice device); public int64 get_idletime (); public void remove_watch (uint id); [NoAccessorMethod] diff --git a/vapi/mutter-clutter-6.vapi b/vapi/mutter-clutter-6.vapi index d66f9ac8..0130a93c 100644 --- a/vapi/mutter-clutter-6.vapi +++ b/vapi/mutter-clutter-6.vapi @@ -6731,6 +6731,7 @@ namespace Clutter { public virtual unowned Clutter.InputDevice get_pointer (); public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings); public virtual Clutter.VirtualDeviceType get_supported_virtual_device_types (); + public bool get_touch_mode (); public virtual GLib.List<weak Clutter.InputDevice> list_devices (); public void set_kbd_a11y_settings (Clutter.KbdA11ySettings settings); public void set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType click_type); @@ -6738,6 +6739,7 @@ namespace Clutter { public virtual void warp_pointer (int x, int y); [NoAccessorMethod] public Clutter.Backend backend { owned get; construct; } + public bool touch_mode { get; } public signal void device_added (Clutter.InputDevice object); public signal void device_removed (Clutter.InputDevice object); public signal void kbd_a11y_flags_changed (uint settings_flags, uint changed_mask); diff --git a/vapi/mutter-cogl-6.vapi b/vapi/mutter-cogl-6.vapi index c9ab5d57..195e3b17 100644 --- a/vapi/mutter-cogl-6.vapi +++ b/vapi/mutter-cogl-6.vapi @@ -1046,18 +1046,9 @@ namespace Cogl { public static void set_depth_test_enabled (bool setting); [CCode (cheader_filename = "cogl/cogl.h")] [Version (deprecated = true, deprecated_since = "1.16")] - public static void shader_compile (Cogl.Handle handle); - [CCode (cheader_filename = "cogl/cogl.h")] - [Version (deprecated = true, deprecated_since = "1.16")] - public static string shader_get_info_log (Cogl.Handle handle); - [CCode (cheader_filename = "cogl/cogl.h")] - [Version (deprecated = true, deprecated_since = "1.16")] public static Cogl.ShaderType shader_get_type (Cogl.Handle handle); [CCode (cheader_filename = "cogl/cogl.h")] [Version (deprecated = true, deprecated_since = "1.16")] - public static bool shader_is_compiled (Cogl.Handle handle); - [CCode (cheader_filename = "cogl/cogl.h")] - [Version (deprecated = true, deprecated_since = "1.16")] public static void shader_source (Cogl.Handle shader, string source); [CCode (cheader_filename = "cogl/cogl.h")] [Version (deprecated = true, deprecated_since = "1.18", since = "1.0")] >From 4464e48b79cb411ec4d0389ca13a2b4d790c60d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <[email protected]> Date: Thu, 20 Feb 2020 14:06:39 +0100 Subject: [PATCH 2/2] meson: Set HAVE_MUTTER_5 in such case only, check HAVE_MUTTER_6 Set if we have mutter-5 only if really found, while use HAVE_MUTTER_6 to check what API we should use. --- src/wm/meson.build | 2 +- src/wm/shim.vala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wm/meson.build b/src/wm/meson.build index 4bcc0f9e..186cf9d2 100644 --- a/src/wm/meson.build +++ b/src/wm/meson.build @@ -26,8 +26,8 @@ if not dep_mutter.found() vapi_mutter = 'libmutter-4' else dep_mutter = dependency('libmutter-5', version: gnome_minimum_version, required: false) - budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_5'] if dep_mutter.found() + budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_5'] message('Using new libmutter-5 ABI from GNOME 3.34') vapi_mutter = 'libmutter-5' else diff --git a/src/wm/shim.vala b/src/wm/shim.vala index d465d469..a174923f 100644 --- a/src/wm/shim.vala +++ b/src/wm/shim.vala @@ -191,7 +191,7 @@ public class ShellShim : GLib.Object osd_proxy = null; } -#if HAVE_MUTTER_5 +#if HAVE_MUTTER_5 || HAVE_MUTTER_6 private void on_accelerator_activated(uint action, Clutter.InputDevice dev, uint timestamp) #else private void on_accelerator_activated(uint action, uint device_id, timestamp) @@ -200,7 +200,7 @@ public class ShellShim : GLib.Object foreach (string accelerator in grabs.get_keys ()) { if (grabs[accelerator] == action) { var params = new GLib.HashTable<string, Variant> (null, null); -#if HAVE_MUTTER_5 +#if HAVE_MUTTER_5 || HAVE_MUTTER_6 params.set ("device-id", new Variant.uint32 (dev.id)); params.set ("action-mode", new Variant.uint32 (action)); params.set ("device-mode", new Variant.string (dev.get_device_node())); @@ -286,7 +286,7 @@ public class ShellShim : GLib.Object return ungrab_accelerator (action); } -#if HAVE_MUTTER_5 +#if HAVE_MUTTER_5 || HAVE_MUTTER_6 public bool UngrabAccelerators(BusName sender, uint[] actions) { foreach (uint action in actions) {
