Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI/QtSwift.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
-rw-r--r--Swift/QtUI/QtSwift.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 20d7bc9..6d8ac7b 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -23,6 +23,7 @@
23#include <Swiften/Elements/Presence.h> 23#include <Swiften/Elements/Presence.h>
24#include <Swiften/Client/Client.h> 24#include <Swiften/Client/Client.h>
25#include <Swiften/Base/Paths.h> 25#include <Swiften/Base/Paths.h>
26#include <Swiften/TLS/TLSContextFactory.h>
26 27
27#include <SwifTools/Application/PlatformApplicationPathProvider.h> 28#include <SwifTools/Application/PlatformApplicationPathProvider.h>
28#include <SwifTools/AutoUpdater/AutoUpdater.h> 29#include <SwifTools/AutoUpdater/AutoUpdater.h>
@@ -32,6 +33,7 @@
32#include <Swift/Controllers/Storages/FileStoragesFactory.h> 33#include <Swift/Controllers/Storages/FileStoragesFactory.h>
33#include <Swift/Controllers/Settings/XMLSettingsProvider.h> 34#include <Swift/Controllers/Settings/XMLSettingsProvider.h>
34#include <Swift/Controllers/Settings/SettingsProviderHierachy.h> 35#include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
36#include <Swift/Controllers/SettingConstants.h>
35#include <Swift/Controllers/MainController.h> 37#include <Swift/Controllers/MainController.h>
36#include <Swift/Controllers/ApplicationInfo.h> 38#include <Swift/Controllers/ApplicationInfo.h>
37#include <Swift/Controllers/BuildVersion.h> 39#include <Swift/Controllers/BuildVersion.h>
@@ -144,6 +146,8 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
144 settingsHierachy_->addProviderToTopOfStack(xmlSettings_); 146 settingsHierachy_->addProviderToTopOfStack(xmlSettings_);
145 settingsHierachy_->addProviderToTopOfStack(qtSettings_); 147 settingsHierachy_->addProviderToTopOfStack(qtSettings_);
146 148
149 networkFactories_.getTLSContextFactory()->setDisconnectOnCardRemoval(settingsHierachy_->getSetting(SettingConstants::DISCONNECT_ON_CARD_REMOVAL));
150
147 std::map<std::string, std::string> emoticons; 151 std::map<std::string, std::string> emoticons;
148 loadEmoticonsFile(":/emoticons/emoticons.txt", emoticons); 152 loadEmoticonsFile(":/emoticons/emoticons.txt", emoticons);
149 loadEmoticonsFile(P2QSTRING(pathToString(Paths::getExecutablePath() / "emoticons.txt")), emoticons); 153 loadEmoticonsFile(P2QSTRING(pathToString(Paths::getExecutablePath() / "emoticons.txt")), emoticons);