From 26fd9c77613cf872850ad01c3bee270b18670f29 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Sat, 22 Mar 2008 23:47:25 +0100
Subject: skip backup files in conf.d, changed some log levels

---
 epgsearch.c    | 3 ++-
 templatefile.c | 2 +-
 uservars.c     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/epgsearch.c b/epgsearch.c
index f942a6f..2555dab 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -569,7 +569,8 @@ void cPluginEpgsearch::LoadConfD()
   string current(".");
   int count = 0;
   while ((e = d.Next())) {
-    if ((current == e->d_name) || (parent == e->d_name)) {
+    string direntry = e->d_name;
+    if ((current == direntry) || (parent == direntry) || (direntry[direntry.size()-1] == '~')) {
       continue;
     }
     /* Check if entry is a directory: I do not rely on e->d_type
diff --git a/templatefile.c b/templatefile.c
index 2e63e65..86d43ee 100644
--- a/templatefile.c
+++ b/templatefile.c
@@ -186,7 +186,7 @@ bool cTemplFile::Parse(const char *Name, const char *Value)
 	    cMenuTemplate* TemplOld = GetTemplateByName(Name);
 	    if (TemplOld)
 	      {
-		LogFile.Log(2, "menu template '%s' gets overwritten", Name);
+		LogFile.Log(1, "menu template '%s' gets overwritten", Name);
 		menuTemplates.erase(TemplOld);
 		delete TemplOld;
 	      }
diff --git a/uservars.c b/uservars.c
index d37b606..d9ab6b0 100644
--- a/uservars.c
+++ b/uservars.c
@@ -270,7 +270,7 @@ bool cUserVarLine::Parse(char *s)
 	cUserVar* oldVar = UserVars.GetFromName(userVar->Name(), false);
 	if (oldVar) // allow redefintion of existing vars
 	  {
-	    LogFile.Log(2, "variable '%s' gets overwritten", oldVar->Name().c_str());
+	    LogFile.Log(1, "variable '%s' gets overwritten", oldVar->Name().c_str());
 	    UserVars.userVars.erase(oldVar);
 	    delete oldVar;
 	  }
-- 
cgit v1.2.3