summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorAlexander Golubev <[email protected]>2021-01-31 16:07:46 +0300
committerSlávek Banko <[email protected]>2021-02-08 17:43:51 +0100
commitce09b7d5e8a8df11ba58723dbce8e1ea6278b54f (patch)
tree6f053cb19025702ca87a711436615a918a33a39a /tdecore
parentd25548e1fa7bf3d06aed9a985455364135e35c10 (diff)
downloadtdelibs-ce09b7d5e8a8df11ba58723dbce8e1ea6278b54f.tar.gz
tdelibs-ce09b7d5e8a8df11ba58723dbce8e1ea6278b54f.zip
tdecore/tdehw: disable SW_RADIO switch if it's the same as SW_RFKILL_ALL
Signed-off-by: Alexander Golubev <[email protected]>
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/tdehw/tdeeventdevice.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tdecore/tdehw/tdeeventdevice.cpp b/tdecore/tdehw/tdeeventdevice.cpp
index ac92599ae..c528a42db 100644
--- a/tdecore/tdehw/tdeeventdevice.cpp
+++ b/tdecore/tdehw/tdeeventdevice.cpp
@@ -120,9 +120,11 @@ void TDEEventDevice::internalReadProvidedSwitches() {
if (BIT_IS_SET(switches, SW_RFKILL_ALL)) {
supportedSwitches = supportedSwitches | TDESwitchType::RFKill;
}
+# if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL
if (BIT_IS_SET(switches, SW_RADIO)) {
supportedSwitches = supportedSwitches | TDESwitchType::Radio;
}
+# endif
if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) {
supportedSwitches = supportedSwitches | TDESwitchType::MicrophoneInsert;
}
@@ -229,9 +231,11 @@ void TDEEventDevice::internalReadActiveSwitches() {
if (BIT_IS_SET(switches, SW_RFKILL_ALL)) {
activeSwitches = activeSwitches | TDESwitchType::RFKill;
}
+# if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL
if (BIT_IS_SET(switches, SW_RADIO)) {
activeSwitches = activeSwitches | TDESwitchType::Radio;
}
+# endif
if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) {
activeSwitches = activeSwitches | TDESwitchType::MicrophoneInsert;
}