Merge branch 'master' of git://git.fedorahosted.org/git/crash-catcher

Conflicts:
	lib/DBus/Makefile.am
	lib/DBus/dbus-crash-catcher.conf
	lib/DBus/dbus-crashcatcher.conf
	src/Daemon/Makefile.am
	src/Daemon/dbus-crashcatcher.conf

1 files changed, 25 insertions, 4 deletions

diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp
index 0af8f07..68734df 100644
--- a/lib/Plugins/Logger.cpp
+++ b/lib/Plugins/Logger.cpp
@@ -1,3 +1,24 @@
+/*
+    Logger.cpp - it simple writes report to specific file
+
+    Copyright (C) 2009  Zdenek Prikryl (zprikryl@redhat.com)
+    Copyright (C) 2009  RedHat inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    */
+
 #include "Logger.h"
 #include <fstream>
 
@@ -8,13 +29,13 @@ CLogger::CLogger() :
 
 void CLogger::SetSettings(const map_settings_t& pSettings)
 {
-    if (pSettings.find("Log_Path")!= pSettings.end())
+    if (pSettings.find("LogPath")!= pSettings.end())
     {
-        m_sLogPath = pSettings.find("Log_Path")->second;
+        m_sLogPath = pSettings.find("LogPath")->second;
     }
-    if (pSettings.find("Append_Logs")!= pSettings.end())
+    if (pSettings.find("AppendLogs")!= pSettings.end())
     {
-        m_bAppendLogs = pSettings.find("Append_Logs")->second == "yes";
+        m_bAppendLogs = pSettings.find("AppendLogs")->second == "yes";
     }
 }