From 6c29ac7c9ca1b09abfcf30df450313ba318647fd Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 18 Apr 2017 16:16:49 +0200 Subject: [PATCH] fix(src/components/core/CoreManager): remove usage of undefined function (`getZrtpSecretsFile`) and remove tabs --- linphone-desktop/src/components/core/CoreManager.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp index f1a883880..860e9b684 100644 --- a/linphone-desktop/src/components/core/CoreManager.cpp +++ b/linphone-desktop/src/components/core/CoreManager.cpp @@ -92,18 +92,13 @@ void CoreManager::setDatabasesPaths () { } void CoreManager::setOtherPaths () { - if (mCore->getZrtpSecretsFile().empty()) - mCore->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath()); - - // This one is actually a database but it MUST be set after the zrtp secrets - // as it allows automatic migration from old version(secrets, xml) to new version (data, sqlite). - mCore->setZrtpCacheDatabasePath(Paths::getZrtpDataFilepath()); + mCore->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath()); if (mCore->getUserCertificatesPath().empty()) - mCore->setUserCertificatesPath(Paths::getUserCertificatesDirpath()); + mCore->setUserCertificatesPath(Paths::getUserCertificatesDirpath()); if (mCore->getRootCa().empty()) - mCore->setRootCa(Paths::getRootCaFilepath()); + mCore->setRootCa(Paths::getRootCaFilepath()); } void CoreManager::setResourcesPaths () {