summaryrefslogtreecommitdiff
path: root/src/actionGroups
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-08-17 06:41:54 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-08-17 06:41:54 +0200
commite605fe5dffe686241847c67166fe2414b48ee2a8 (patch)
tree5b506de0a4faa0506d0cf053af8e9d7184aa59bf /src/actionGroups
parent6617f5ee51c94d05028ebceb3177ec0e3a87e78d (diff)
parent6a2a889a6de6b45fcc21e0050763858768610952 (diff)
Merge branch 'release/debian/0.7.3-1'debian/0.7.3-1
Diffstat (limited to 'src/actionGroups')
-rw-r--r--src/actionGroups/actionGroup.vala2
-rw-r--r--src/actionGroups/bookmarkGroup.vala2
-rw-r--r--src/actionGroups/clipboardGroup.vala2
-rw-r--r--src/actionGroups/devicesGroup.vala2
-rw-r--r--src/actionGroups/groupRegistry.vala2
-rw-r--r--src/actionGroups/menuGroup.vala2
-rw-r--r--src/actionGroups/sessionGroup.vala2
-rw-r--r--src/actionGroups/windowListGroup.vala15
8 files changed, 16 insertions, 13 deletions
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;
}