X11: drop obsolete setting enablesystemkeys

diff --git a/language/English/strings.po b/language/English/strings.po
index 685847c..a2e539e 100755 (executable)
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -13029,12 +13029,7 @@ msgctxt "#35102"
 msgid "Disable joystick when this device is present"
 msgstr ""
 
-#: system/settings/settings.xml
-msgctxt "#35103"
-msgid "Enable system keys in fullscreen"
-msgstr ""
-
-#empty strings from id 35104 to 35499
+#empty strings from id 35103 to 35499
 
 #: Unknown
 msgctxt "#35500"
@@ -15469,11 +15464,7 @@ msgctxt "#37018"
 msgid "Boost centre channel when downmixing"
 msgstr ""
 
-#. Description of setting "System -> Input devices -> Enable system keys in fullscreen" with label #35103
-#: system/settings/settings.xml
-msgctxt "#37019"
-msgid "Enables system keys like printscreen, alt-tab and volume keys when in fullscreen."
-msgstr ""
+#empty strings from id 37019 to 37019
 
 #: system/settings/rbp.xml
 msgctxt "#37020"

diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml
index 584e4a4..e41d93d 100644 (file)
--- a/system/settings/darwin.xml
+++ b/system/settings/darwin.xml
@@ -61,13 +61,6 @@
           </control>
         </setting>
       </group>
-      <group id="2">
-        <setting id="input.enablesystemkeys" type="boolean" label="35103" help="37019">
-          <visible>false</visible>
-          <default>yes</default>
-          <control type="toggle" />
-        </setting>
-      </group>
     </category>
   </section>
 </settings>

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index eb64f62..0e4e952 100644 (file)
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -2629,15 +2629,6 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
-        <setting id="input.enablesystemkeys" type="boolean" label="35103" help="37019">
-          <and>
-            <requirement>HAS_GL</requirement>
-            <requirement>HAVE_X11</requirement>
-          </and>
-          <level>2</level>
-          <default>false</default>
-          <control type="toggle" />
-        </setting>
       </group>
     </category>
     <category id="network" label="798" help="36379">

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 013adf9..75da811 100644 (file)
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -1102,12 +1102,6 @@ void CSettings::InitializeISettingCallbacks()
   settingSet.insert("input.enablemouse");
   m_settingsManager->RegisterCallback(&g_Mouse, settingSet);
 
-#if defined(HAS_GL) && defined(HAVE_X11)
-  settingSet.clear();
-  settingSet.insert("input.enablesystemkeys");
-  m_settingsManager->RegisterCallback(&g_Windowing, settingSet);
-#endif
-
   settingSet.clear();
   settingSet.insert("services.webserver");
   settingSet.insert("services.webserverport");