Permalink
Browse files

Merge pull request #1234 from garbear/remove-autodetect

Remove unused code and messages for auto-detecting FTP servers on networked XBOXs
  • Loading branch information...
2 parents b0c5422 + 214f3d0 commit 8621a9d9a18c3ca09c98fabe9072063f6308e5d4 Arne Morten Kvarving committed Aug 3, 2012
Showing with 1 addition and 38 deletions.
  1. +1 −33 language/English/strings.po
  2. +0 −3 xbmc/settings/AdvancedSettings.cpp
  3. +0 −2 xbmc/settings/AdvancedSettings.h
View
34 language/English/strings.po
@@ -3158,39 +3158,7 @@ msgctxt "#1235"
msgid "Programs & pictures & video"
msgstr ""
-#empty strings from id 1236 to 1249
-
-msgctxt "#1250"
-msgid "Auto-detection"
-msgstr ""
-
-msgctxt "#1251"
-msgid "Auto-detect system"
-msgstr ""
-
-msgctxt "#1252"
-msgid "Nickname"
-msgstr ""
-
-#empty string with id 1253
-
-msgctxt "#1254"
-msgid "Ask to connect"
-msgstr ""
-
-msgctxt "#1255"
-msgid "Send FTP user and password"
-msgstr ""
-
-msgctxt "#1256"
-msgid "Ping interval"
-msgstr ""
-
-msgctxt "#1257"
-msgid "Would you like to connect to the auto-detected system?"
-msgstr ""
-
-#empty string with id 1258
+#empty strings from id 1236 to 1258
msgctxt "#1259"
msgid "Zeroconf"
View
3 xbmc/settings/AdvancedSettings.cpp
@@ -129,8 +129,6 @@ void CAdvancedSettings::Initialize()
m_lcdScrolldelay = 1;
m_lcdHostName = "localhost";
- m_autoDetectPingTime = 30;
-
m_songInfoDuration = 10;
m_busyDialogDelay = 2000;
@@ -660,7 +658,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
pElement = pRootElement->FirstChildElement("network");
if (pElement)
{
- XMLUtils::GetInt(pElement, "autodetectpingtime", m_autoDetectPingTime, 1, 240);
XMLUtils::GetInt(pElement, "curlclienttimeout", m_curlconnecttimeout, 1, 1000);
XMLUtils::GetInt(pElement, "curllowspeedtime", m_curllowspeedtime, 1, 1000);
XMLUtils::GetInt(pElement, "curlretries", m_curlretries, 0, 10);
View
2 xbmc/settings/AdvancedSettings.h
@@ -175,8 +175,6 @@ class CAdvancedSettings
int m_lcdScrolldelay;
CStdString m_lcdHostName;
- int m_autoDetectPingTime;
-
int m_songInfoDuration;
int m_busyDialogDelay;
int m_logLevel;

0 comments on commit 8621a9d

Please sign in to comment.