xbmc: completely disable online check

This commit is contained in:
Stefan Saraev 2014-01-10 20:04:39 +02:00
parent f3cd2b7f25
commit 779a1f09a4
2 changed files with 61 additions and 15 deletions

View File

@ -0,0 +1,61 @@
From 7503fd2355ab44503cf38809c5ba70ef2c0f2144 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 10 Jan 2014 19:44:16 +0200
Subject: [PATCH] disable online check
---
xbmc/GUIInfoManager.cpp | 1 -
xbmc/utils/SystemInfo.cpp | 5 +----
xbmc/windows/GUIWindowSystemInfo.cpp | 1 -
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 10173ee..70a474a 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -271,7 +271,6 @@ const infomap system_labels[] = {{ "hasnetwork", SYSTEM_ETHERNET_LINK_ACT
{ "currentwindow", SYSTEM_CURRENT_WINDOW },
{ "currentcontrol", SYSTEM_CURRENT_CONTROL },
{ "dvdlabel", SYSTEM_DVD_LABEL },
- { "internetstate", SYSTEM_INTERNET_STATE },
{ "kernelversion", SYSTEM_KERNEL_VERSION },
{ "uptime", SYSTEM_UPTIME },
{ "totaluptime", SYSTEM_TOTALUPTIME },
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index c77d495..06459dc 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -72,7 +72,6 @@ bool CSysInfoJob::DoWork()
{
m_info.systemUptime = GetSystemUpTime(false);
m_info.systemTotalUptime = GetSystemUpTime(true);
- m_info.internetState = GetInternetState();
m_info.videoEncoder = GetVideoEncoder();
m_info.cpuFrequency = GetCPUFreqInfo();
m_info.kernelVersion = CSysInfo::GetKernelVersion();
@@ -569,9 +568,7 @@ CStdString CSysInfo::GetKernelVersion()
bool CSysInfo::HasInternet()
{
- if (m_info.internetState != CSysData::UNKNOWN)
- return m_info.internetState == CSysData::CONNECTED;
- return (m_info.internetState = CSysInfoJob::GetInternetState()) == CSysData::CONNECTED;
+ return m_info.internetState == CSysData::UNKNOWN;
}
CStdString CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
index 60aa49d..a0a2e27 100644
--- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove()
SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS);
SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS);
SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS);
- SetControlLabel(i++, "%s %s", 13295, SYSTEM_INTERNET_STATE);
}
else if (m_section == CONTROL_BT_VIDEO)
{
--
1.8.3.2

View File

@ -1,15 +0,0 @@
diff -Naur a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
--- a/xbmc/filesystem/CurlFile.cpp 2011-03-08 02:49:14.000000000 +0100
+++ b/xbmc/filesystem/CurlFile.cpp 2011-10-17 19:21:04.180783870 +0200
@@ -803,9 +803,9 @@
// Detect whether we are "online" or not! Very simple and dirty!
bool CFileCurl::IsInternet(bool checkDNS /* = true */)
{
- CStdString strURL = "http://www.google.com";
+ CStdString strURL = "http://online.openelec.tv";
if (!checkDNS)
- strURL = "http://74.125.19.103"; // www.google.com ip
+ strURL = "http://212.101.13.11"; // online.openelec.tv ip
bool found = Exists(strURL);
Close();