From 38bebbbddf1b2e8620c6b3c2101f689c0296a1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 3 Aug 2021 20:24:02 +0200 Subject: New upstream version 0.7.3 --- src/actionGroups/actionGroup.vala | 2 +- src/actionGroups/bookmarkGroup.vala | 2 +- src/actionGroups/clipboardGroup.vala | 2 +- src/actionGroups/devicesGroup.vala | 2 +- src/actionGroups/groupRegistry.vala | 2 +- src/actionGroups/menuGroup.vala | 2 +- src/actionGroups/sessionGroup.vala | 2 +- src/actionGroups/windowListGroup.vala | 15 +++++++++------ 8 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src/actionGroups') diff --git a/src/actionGroups/actionGroup.vala b/src/actionGroups/actionGroup.vala index 37319d7..e617165 100644 --- a/src/actionGroups/actionGroup.vala +++ b/src/actionGroups/actionGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/bookmarkGroup.vala b/src/actionGroups/bookmarkGroup.vala index 43a5a79..89cd16d 100644 --- a/src/actionGroups/bookmarkGroup.vala +++ b/src/actionGroups/bookmarkGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/clipboardGroup.vala b/src/actionGroups/clipboardGroup.vala index 817efd2..3007376 100644 --- a/src/actionGroups/clipboardGroup.vala +++ b/src/actionGroups/clipboardGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/devicesGroup.vala b/src/actionGroups/devicesGroup.vala index 76d783f..1a6af09 100644 --- a/src/actionGroups/devicesGroup.vala +++ b/src/actionGroups/devicesGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala index 95f3790..6344884 100644 --- a/src/actionGroups/groupRegistry.vala +++ b/src/actionGroups/groupRegistry.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/menuGroup.vala b/src/actionGroups/menuGroup.vala index 88ff2ed..d4c720d 100644 --- a/src/actionGroups/menuGroup.vala +++ b/src/actionGroups/menuGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/sessionGroup.vala b/src/actionGroups/sessionGroup.vala index f176745..8bc26cb 100644 --- a/src/actionGroups/sessionGroup.vala +++ b/src/actionGroups/sessionGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala index ba5ea2b..34ada18 100644 --- a/src/actionGroups/windowListGroup.vala +++ b/src/actionGroups/windowListGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -176,6 +176,9 @@ public class WindowListGroup : ActionGroup { string icon_name = ""; #if HAVE_BAMF + + // bamf is not supported on wayland + if (GLib.Environment.get_variable("XDG_SESSION_TYPE") == "x11") { var xid = (uint32) window.get_xid(); Bamf.Matcher bamf_matcher = Bamf.Matcher.get_default(); Bamf.Application app = bamf_matcher.get_application_for_xid(xid); @@ -202,14 +205,14 @@ public class WindowListGroup : ActionGroup { error("%s", e.message); } } - } else { - var application = window.get_application(); - icon_name = application.get_icon_name().down(); } - #else + } + #endif + + if (icon_name == "") { var application = window.get_application(); icon_name = application.get_icon_name().down(); - #endif + } return icon_name; } -- cgit v1.2.3