From e50baedac033c52788f89ad7cb82a21860536147 Mon Sep 17 00:00:00 2001
From: Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>
Date: Sun, 10 Aug 2014 17:57:20 +0200
Subject: release version 0.4.2

---
 HISTORY        |  3 +++
 Makefile       |  4 ++--
 config.c       |  2 +-
 po/de_DE.po    |  2 +-
 setup.c        | 10 +++++-----
 skinflatplus.c |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/HISTORY b/HISTORY
index e274e244..5297586d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,9 @@
 VDR Plugin 'skinflatplus' Revision History
 ---------------------------------------
 
+2014-08-10: Version 0.4.2
+- [update] change direcotry of config-files
+
 2014-08-10: Version 0.4.1
 - [add] option to hide "clock" text
 - [add] option to set program past/remaining time format (past/remaining, past, remaining)
diff --git a/Makefile b/Makefile
index 79da441d..b7a014dd 100644
--- a/Makefile
+++ b/Makefile
@@ -142,8 +142,8 @@ install-icons:
 	cp -r --remove-destination icons/* $(DESTDIR)$(PLGRESDIR)/icons
 
 install-configs:
-	mkdir -p $(DESTDIR)$(PLGRESDIR)/configs
-	cp configs/* $(DESTDIR)$(PLGRESDIR)/configs
+	mkdir -p $(DESTDIR)$(VDRCONFDIR)/plugins/$(PLUGIN)/configs
+	cp configs/* $(DESTDIR)$(VDRCONFDIR)/plugins/$(PLUGIN)/configs
 
 install: install-lib install-i18n install-themes install-icons install-decors install-configs
 
diff --git a/config.c b/config.c
index 35492099..902e517c 100644
--- a/config.c
+++ b/config.c
@@ -727,7 +727,7 @@ void cFlatConfig::Store(const char *Name, const char *Value, const char *Filenam
 }
 
 void cFlatConfig::GetConfigFiles(cStringList &Files) {
-    cString configsPath = cString::sprintf("%s/configs", PLUGINRESOURCEPATH);
+    cString configsPath = cString::sprintf("%s/configs", cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
     std::vector<std::string> files;
     Files.Clear();
 
diff --git a/po/de_DE.po b/po/de_DE.po
index c76cd19f..89ad8144 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-skinflat 0.4.1\n"
+"Project-Id-Version: vdr-skinflat 0.4.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2014-08-10 11:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
diff --git a/setup.c b/setup.c
index 0c089da3..da71b5f6 100644
--- a/setup.c
+++ b/setup.c
@@ -274,7 +274,7 @@ void cFlatSetup::Store(void) {
 }
 
 void cFlatSetupGeneral::LoadConfigFile(void) {
-    cString Filename = cString::sprintf("%s/configs/%s", PLUGINRESOURCEPATH, ConfigFiles[ConfigFileSelection]);
+    cString Filename = cString::sprintf("%s/configs/%s", cPlugin::ConfigDirectory(PLUGIN_NAME_I18N), ConfigFiles[ConfigFileSelection]);
 
     FILE *f = fopen(Filename, "r");
     if( f ) {
@@ -294,13 +294,14 @@ void cFlatSetupGeneral::LoadConfigFile(void) {
                     *v++ = 0;
                     n = stripspace(skipspace(n));
                     v = stripspace(skipspace(v));
-                    bool error = SetupParse(n, v);
-                    if( error )
+                    bool success = SetupParse(n, v);
+                    if( !success )
                         dsyslog("flatplus: failed to load config: %s with value: %s", n, v);
                 }
             }
         }
-    }
+    } else
+        dsyslog("flatplus: failed to load config: file <%s> not found", *Filename);
     cString msg = cString::sprintf("%s %s %s", tr("configfile"), ConfigFiles[ConfigFileSelection], tr("loaded"));
     Skins.Message(mtInfo, msg);
 }
@@ -410,7 +411,6 @@ bool cFlatSetupGeneral::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "ChannelBitrateShowCalcInterval") == 0)       SetupConfig->ChannelBitrateShowCalcInterval = atoi(Value);
     else if (strcmp(Name, "TopBarHideClockText") == 0)                  SetupConfig->TopBarHideClockText = atoi(Value);
     else if (strcmp(Name, "ChannelTimeLeft") == 0)                      SetupConfig->ChannelTimeLeft = atoi(Value);
-
     else return false;
 
     return true;
diff --git a/skinflatplus.c b/skinflatplus.c
index 74141182..b84346d1 100644
--- a/skinflatplus.c
+++ b/skinflatplus.c
@@ -16,7 +16,7 @@
 #include "setup.h"
 #include "imageloader.h"
 
-static const char *VERSION        = "0.4.1";
+static const char *VERSION        = "0.4.2";
 static const char *DESCRIPTION    = "skin flatplus";
 
 class cPluginFlat : public cPlugin {
-- 
cgit v1.2.3