From 6a6729b65b65b7c4465bd20d82221806b175e921 Mon Sep 17 00:00:00 2001
From: eshe <jessehakanen@gmail.com>
Date: Sun, 27 Jun 2010 21:08:50 +0100
Subject: [PATCH] Small fix to Eniro setting handling.

---
 src/common/eniro.cpp           |    1 -
 src/common/enirocoreconfig.cpp |    4 +++-
 src/daemon/calllistener.cpp    |    4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/eniro.cpp b/src/common/eniro.cpp
index 9a9f1a2..d3ebf5b 100644
--- a/src/common/eniro.cpp
+++ b/src/common/eniro.cpp
@@ -512,7 +512,6 @@ void Eniro::emitRequestFinished(int key, SearchData* data, bool error)
 QMap <Eniro::Site, Eniro::SiteDetails> Eniro::getSites()
 {
     QMap <Site, SiteDetails> sites;
-    SiteDetails details;
 
     for(int i = 0; i < SITE_COUNT; i++)
     {
diff --git a/src/common/enirocoreconfig.cpp b/src/common/enirocoreconfig.cpp
index e272bce..86af526 100644
--- a/src/common/enirocoreconfig.cpp
+++ b/src/common/enirocoreconfig.cpp
@@ -65,7 +65,9 @@ void EniroCoreConfig::getConfig(QMap<QString, QString>& config)
 {
     load();
 
-    config = config_;
+    config[USERNAME_COLUMN] = config_[USERNAME_COLUMN];
+    config[PASSWORD_COLUMN] = config_[PASSWORD_COLUMN];
+    config[SITE_COLUMN] = config_[SITE_COLUMN];
 }
 
 void EniroCoreConfig::loadFromConfig(QMap<QString, QString> const& config)
diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index d977f36..debb367 100644
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -60,8 +60,10 @@ bool CallListener::begin()
     }
 
     sourceId_ = Source::stringToId(Settings::instance()->get("source"));
+    QMap<QString, QString> tmpConfig;
     SourceCoreConfig* config = SourceCoreConfig::getCoreConfig(sourceId_);
-    config->getConfig(sourceConfig_);
+    config->getConfig(tmpConfig);
+    sourceConfig_ = tmpConfig;
     delete config;
 
     systemBus_.connect(CALL_SERVICE_NAME,
-- 
1.7.9.5