[SCM] kodi-pvr-vdr-vnsi/master: drop setting VDR Messages, msgs are required

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2cdaeae77cdd00345f205f6a7242136534a54b7
Author: Rainer Hochecker <fernetmenta at online.de>
Date:   Sun Apr 24 12:41:26 2016 +0200

    drop setting VDR Messages, msgs are required

diff --git a/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po b/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
index 03ee6f0..3e89319 100644
--- a/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
+++ b/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
@@ -38,10 +38,6 @@ msgctxt "#30004"
 msgid "Connect timeout (s)"
 msgstr ""
 
-msgctxt "#30005"
-msgid "Allow VDR Messages"
-msgstr ""
-
 msgctxt "#30006"
 msgid "Read recordings from directory"
 msgstr ""
diff --git a/pvr.vdr.vnsi/resources/settings.xml b/pvr.vdr.vnsi/resources/settings.xml
index 95a4813..80275b6 100644
--- a/pvr.vdr.vnsi/resources/settings.xml
+++ b/pvr.vdr.vnsi/resources/settings.xml
@@ -6,7 +6,6 @@
     <setting id="timeshift" type="enum" label="30047" values="0|1" default="1"/>
     <setting id="convertchar" type="bool" label="30003" default="true" />
     <setting id="timeout" type="enum" label="30004" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="3"/>
-    <setting id="handlemessages" type="bool" label="30005" default="true" />
     <setting id="autochannelgroups" type="bool" label="30046" default="false" />
     <setting id="iconpath" type="folder" source="files" label="30048" default="" />
     <setting id="wol_mac" type="text" label="30049" default="" />
diff --git a/src/VNSIData.cpp b/src/VNSIData.cpp
index 95238b3..8e9c369 100644
--- a/src/VNSIData.cpp
+++ b/src/VNSIData.cpp
@@ -102,7 +102,7 @@ void cVNSIData::OnDisconnect()
 
 void cVNSIData::OnReconnect()
 {
-  EnableStatusInterface(g_bHandleMessages, false);
+  EnableStatusInterface(true, false);
 
   PVR->ConnectionStateChange("vnsi connection established", PVR_CONNECTION_STATE_CONNECTED, XBMC->GetLocalizedString(30045));
 
diff --git a/src/client.cpp b/src/client.cpp
index 3a4b8db..ac738e2 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -47,7 +47,6 @@ std::string   g_szHostname              = DEFAULT_HOST;
 std::string   g_szWolMac                = "";
 int           g_iPort                   = DEFAULT_PORT;
 bool          g_bCharsetConv            = DEFAULT_CHARCONV;     ///< Convert VDR's incoming strings to UTF8 character set
-bool          g_bHandleMessages         = DEFAULT_HANDLE_MSG;   ///< Send VDR's OSD status messages to XBMC OSD
 int           g_iConnectTimeout         = DEFAULT_TIMEOUT;      ///< The Socket connection timeout
 int           g_iPriority               = DEFAULT_PRIORITY;     ///< The Priority this client have in response to other clients
 bool          g_bAutoChannelGroups      = DEFAULT_AUTOGROUPS;
@@ -189,14 +188,6 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props)
     g_iConnectTimeout = DEFAULT_TIMEOUT;
   }
 
-  /* Read setting "handlemessages" from settings.xml */
-  if (!XBMC->GetSetting("handlemessages", &g_bHandleMessages))
-  {
-    /* If setting is unknown fallback to defaults */
-    XBMC->Log(LOG_ERROR, "Couldn't get 'handlemessages' setting, falling back to 'true' as default");
-    g_bHandleMessages = DEFAULT_HANDLE_MSG;
-  }
-
   /* Read setting "autochannelgroups" from settings.xml */
   if (!XBMC->GetSetting("autochannelgroups", &g_bAutoChannelGroups))
   {
@@ -338,12 +329,6 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
     XBMC->Log(LOG_INFO, "Changed Setting 'timeout' from %u to %u", g_iConnectTimeout, *(int*) settingValue);
     g_iConnectTimeout = *(int*) settingValue;
   }
-  else if (str == "handlemessages")
-  {
-    XBMC->Log(LOG_INFO, "Changed Setting 'handlemessages' from %u to %u", g_bHandleMessages, *(bool*) settingValue);
-    g_bHandleMessages = *(bool*) settingValue;
-    if (VNSIData) VNSIData->EnableStatusInterface(g_bHandleMessages);
-  }
   else if (str == "autochannelgroups")
   {
     XBMC->Log(LOG_INFO, "Changed Setting 'autochannelgroups' from %u to %u", g_bAutoChannelGroups, *(bool*) settingValue);
diff --git a/src/client.h b/src/client.h
index aef2f4e..c67eb12 100644
--- a/src/client.h
+++ b/src/client.h
@@ -39,7 +39,6 @@ extern int          g_iPort;              ///< TCP port of the vnsi server
 extern int          g_iConnectTimeout;    ///< Network connection / read timeout in seconds
 extern int          g_iPriority;          ///< The Priority this client have in response to other clients
 extern bool         g_bCharsetConv;       ///< Convert VDR's incoming strings to UTF8 character set
-extern bool         g_bHandleMessages;    ///< Send VDR's OSD status messages to XBMC OSD
 extern int          g_iTimeshift;
 extern std::string  g_szIconPath;         ///< path to channel icons
 

-- 
kodi-pvr-vdr-vnsi packaging