mirror of
https://github.com/elementary/gala.git
synced 2024-09-11 15:15:39 +03:00
DBusAccelerator: Fix grab_accelerator argument order (#761)
This commit is contained in:
parent
b450a98314
commit
79f998e75d
@ -18,10 +18,10 @@
|
|||||||
namespace Gala {
|
namespace Gala {
|
||||||
public struct Accelerator {
|
public struct Accelerator {
|
||||||
public string name;
|
public string name;
|
||||||
|
public uint flags;
|
||||||
#if HAS_MUTTER332
|
#if HAS_MUTTER332
|
||||||
public uint grab_flags;
|
public Meta.KeyBindingFlags grab_flags;
|
||||||
#endif
|
#endif
|
||||||
public Meta.KeyBindingFlags flags;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[DBus (name="org.gnome.Shell")]
|
[DBus (name="org.gnome.Shell")]
|
||||||
@ -73,7 +73,7 @@ namespace Gala {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if HAS_MUTTER332
|
#if HAS_MUTTER332
|
||||||
public uint grab_accelerator (string accelerator, uint grab_flags, uint flags) throws DBusError, IOError {
|
public uint grab_accelerator (string accelerator, uint flags, Meta.KeyBindingFlags grab_flags) throws DBusError, IOError {
|
||||||
#else
|
#else
|
||||||
public uint grab_accelerator (string accelerator, uint flags) throws DBusError, IOError {
|
public uint grab_accelerator (string accelerator, uint flags) throws DBusError, IOError {
|
||||||
#endif
|
#endif
|
||||||
@ -81,7 +81,7 @@ namespace Gala {
|
|||||||
|
|
||||||
if (action == null) {
|
if (action == null) {
|
||||||
#if HAS_MUTTER332
|
#if HAS_MUTTER332
|
||||||
action = wm.get_display ().grab_accelerator (accelerator, (Meta.KeyBindingFlags)flags);
|
action = wm.get_display ().grab_accelerator (accelerator, grab_flags);
|
||||||
#elif HAS_MUTTER330
|
#elif HAS_MUTTER330
|
||||||
action = wm.get_display ().grab_accelerator (accelerator);
|
action = wm.get_display ().grab_accelerator (accelerator);
|
||||||
#else
|
#else
|
||||||
@ -100,7 +100,7 @@ namespace Gala {
|
|||||||
|
|
||||||
foreach (unowned Accelerator? accelerator in accelerators) {
|
foreach (unowned Accelerator? accelerator in accelerators) {
|
||||||
#if HAS_MUTTER332
|
#if HAS_MUTTER332
|
||||||
actions += grab_accelerator (accelerator.name, accelerator.grab_flags, accelerator.flags);
|
actions += grab_accelerator (accelerator.name, accelerator.flags, accelerator.grab_flags);
|
||||||
#else
|
#else
|
||||||
actions += grab_accelerator (accelerator.name, accelerator.flags);
|
actions += grab_accelerator (accelerator.name, accelerator.flags);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user