CHANGE(client): Don't hard block shortcuts on Wayland

In #5307 we disabled global shortcuts on Wayland, but we did it in a way
that would prevent anyone from re-enabling the support.

Since we have received reports of some users actually making use of the
shortcut system on Wayland, even without proper Wayland support, we
decided to remove the hard-lock and allow these users to re-enable the
shortcuts, if they so want.

Fixes #5454

4 files changed, 2 insertions, 17 deletions

diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp
index 5f5155e39..23fe3a02b 100644
--- a/src/mumble/GlobalShortcut.cpp
+++ b/src/mumble/GlobalShortcut.cpp
@@ -532,8 +532,6 @@ GlobalShortcutConfig::GlobalShortcutConfig(Settings &st) : ConfigWidget(st) {
 	if (EnvUtils::waylandIsUsed()) {
 		// Our global shortcut system doesn't work with Wayland
 		qlWaylandNote->setVisible(true);
-
-		qgbShortcuts->setEnabled(false);
 	}
 #endif
 
diff --git a/src/mumble/GlobalShortcut.ui b/src/mumble/GlobalShortcut.ui
index af65a45c1..55faa57fa 100644
--- a/src/mumble/GlobalShortcut.ui
+++ b/src/mumble/GlobalShortcut.ui
@@ -98,7 +98,7 @@
    <item>
     <widget class="QLabel" name="qlWaylandNote">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mumble's Global Shortcuts system does currently not work in combination with the Wayland protocol. For more information, visit &lt;a href=&quot;https://github.com/mumble-voip/mumble/issues/5257&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;https://github.com/mumble-voip/mumble/issues/5257&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mumble's Global Shortcuts system does currently not work properly in combination with the Wayland protocol. For more information, visit &lt;a href=&quot;https://github.com/mumble-voip/mumble/issues/5257&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;https://github.com/mumble-voip/mumble/issues/5257&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp
index d89bbb139..2d3351cae 100644
--- a/src/mumble/GlobalShortcut_unix.cpp
+++ b/src/mumble/GlobalShortcut_unix.cpp
@@ -5,7 +5,6 @@
 
 #include "GlobalShortcut_unix.h"
 
-#include "EnvUtils.h"
 #include "Settings.h"
 #include "Global.h"
 
@@ -63,12 +62,6 @@ GlobalShortcutX::GlobalShortcutX() {
 	}
 
 #ifdef Q_OS_LINUX
-	if (EnvUtils::waylandIsUsed()) {
-		qWarning("GlobalShortcutX: Global shortcuts don't work on Wayland (see "
-				 "https://github.com/mumble-voip/mumble/issues/5257)");
-		return;
-	}
-
 	if (Global::get().s.bEnableEvdev) {
 		QString dir             = QLatin1String("/dev/input");
 		QFileSystemWatcher *fsw = new QFileSystemWatcher(QStringList(dir), this);
diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp
index 947b5d398..09b5aff75 100644
--- a/src/mumble/Settings.cpp
+++ b/src/mumble/Settings.cpp
@@ -530,6 +530,7 @@ Settings::Settings() {
 
 #ifdef Q_OS_LINUX
 	if (EnvUtils::waylandIsUsed()) {
+		// Due to the issues we're currently having on Wayland, we disable shortcuts by default
 		bShortcutEnable = false;
 	}
 #endif
@@ -1025,13 +1026,6 @@ void Settings::legacyLoad(const QString &path) {
 	LOAD(bEnableXboxInput, "shortcut/windows/xbox/enable");
 	LOAD(bEnableUIAccess, "shortcut/windows/uiaccess/enable");
 
-#ifdef Q_OS_LINUX
-	if (EnvUtils::waylandIsUsed()) {
-		// Global shortcuts don't work on Wayland
-		bShortcutEnable = false;
-	}
-#endif
-
 	// Search options
 	LOAD(searchForUsers, "search/search_for_users");
 	LOAD(searchForChannels, "search/search_for_channels");