diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-13 13:51:23 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-13 13:51:23 +0200 |
| commit | 9e618cc3f9a59038213aa8a91382a4c84315f569 (patch) | |
| tree | 62a1ac64c4a6299e6ab787864ed3b97305acdecc /src/pies | |
| parent | 394ad3b32f9f79775bcac4c6cc2a4dfa74586800 (diff) | |
| parent | d98e3381ccbe703a6df8fad73b69546dd72a8705 (diff) | |
Merge branch 'release/0.7.1-1'0.7.1-1
Diffstat (limited to 'src/pies')
| -rw-r--r-- | src/pies/defaultConfig.vala | 6 | ||||
| -rw-r--r-- | src/pies/load.vala | 8 | ||||
| -rw-r--r-- | src/pies/pie.vala | 2 | ||||
| -rw-r--r-- | src/pies/pieManager.vala | 2 | ||||
| -rw-r--r-- | src/pies/save.vala | 2 |
5 files changed, 12 insertions, 8 deletions
diff --git a/src/pies/defaultConfig.vala b/src/pies/defaultConfig.vala index 4041111..d832347 100644 --- a/src/pies/defaultConfig.vala +++ b/src/pies/defaultConfig.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2016 by Simon Schneegans +// Copyright (c) 2011-2017 by Simon Schneegans // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -63,8 +63,10 @@ namespace Pies { window.add_action(new KeyAction(_("Restore"), "view-restore", "<Alt>F5")); // add a pie with window list group - var alt_tab = PieManager.create_persistent_pie("Alt Tab", "dock", new Trigger.from_string("<Control><Alt>T")); + if (GLib.Environment.get_variable("XDG_SESSION_TYPE") != "wayland") { + var alt_tab = PieManager.create_persistent_pie("Alt Tab", "preferences-system-windows", new Trigger.from_string("<Control><Alt>T")); alt_tab.add_group(new WindowListGroup(alt_tab.id)); + } // save the configuration to file Pies.save(); diff --git a/src/pies/load.vala b/src/pies/load.vala index 20e18d8..976d818 100644 --- a/src/pies/load.vala +++ b/src/pies/load.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2016 by Simon Schneegans +// Copyright (c) 2011-2017 by Simon Schneegans // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -199,9 +199,11 @@ namespace Pies { } ActionGroup group = GroupRegistry.create_group(type, pie.id); - group.on_load(slice); - if (group != null) pie.add_group(group); + if (group != null) { + group.on_load(slice); + pie.add_group(group); + } } } diff --git a/src/pies/pie.vala b/src/pies/pie.vala index be17238..ef5549c 100644 --- a/src/pies/pie.vala +++ b/src/pies/pie.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2016 by Simon Schneegans +// Copyright (c) 2011-2017 by Simon Schneegans // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala index d9bf5b7..6951508 100644 --- a/src/pies/pieManager.vala +++ b/src/pies/pieManager.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2016 by Simon Schneegans +// Copyright (c) 2011-2017 by Simon Schneegans // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/src/pies/save.vala b/src/pies/save.vala index 0a2d401..2c5e191 100644 --- a/src/pies/save.vala +++ b/src/pies/save.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2016 by Simon Schneegans +// Copyright (c) 2011-2017 by Simon Schneegans // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by |