1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index b61147d..7b4e2c3 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -202,61 +202,61 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
         "themes/Default/Lato2OFL/Lato-Italic.ttf",
         "themes/Default/Lato2OFL/Lato-Light.ttf",
         "themes/Default/Lato2OFL/Lato-LightItalic.ttf",
         "themes/Default/Lato2OFL/Lato-Medium.ttf",
         "themes/Default/Lato2OFL/Lato-MediumItalic.ttf",
         "themes/Default/Lato2OFL/Lato-Regular.ttf",
         "themes/Default/Lato2OFL/Lato-Semibold.ttf",
         "themes/Default/Lato2OFL/Lato-SemiboldItalic.ttf",
         "themes/Default/Lato2OFL/Lato-Thin.ttf",
         "themes/Default/Lato2OFL/Lato-ThinItalic.ttf"
     };
 
     for (auto&& fontName : fontNames) {
         std::string fontPath = std::string(":/") + fontName;
         int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
         assert((error != -1) && "Failed to load font.");
     }
 
     bool enableAdHocCommandOnJID = options.count("enable-jid-adhocs") > 0;
     tabs_ = nullptr;
     if (options.count("no-tabs") && !splitter_) {
         tabs_ = new QtChatTabsShortcutOnlySubstitute();
     }
     else {
         tabs_ = new QtChatTabs(splitter_ != nullptr, settingsHierachy_, true);
     }
     bool startMinimized = options.count("start-minimized") > 0;
     applicationPathProvider_ = new PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME);
     storagesFactory_ = new FileStoragesFactory(applicationPathProvider_->getDataDir(), networkFactories_.getCryptoProvider());
     certificateStorageFactory_ = new CertificateFileStorageFactory(applicationPathProvider_->getDataDir(), tlsFactories_.getCertificateFactory(), networkFactories_.getCryptoProvider());
-    chatWindowFactory_ = new QtChatWindowFactory(splitter_, settingsHierachy_, qtSettings_, tabs_, ":/themes/Default/");
+    chatWindowFactory_ = new QtChatWindowFactory(splitter_, settingsHierachy_, qtSettings_, tabs_, ":/themes/Default/", emoticons);
     soundPlayer_ = new QtSoundPlayer(applicationPathProvider_);
 
     // Ugly, because the dock depends on the tray, but the temporary
     // multi-account hack creates one tray per account.
     QtSystemTray* systemTray = new QtSystemTray();
     systemTrays_.push_back(systemTray);
 
 #if defined(HAVE_GROWL)
     notifier_ = new GrowlNotifier(SWIFT_APPLICATION_NAME);
 #elif defined(SWIFTEN_PLATFORM_WINDOWS)
     notifier_ = new WindowsNotifier(SWIFT_APPLICATION_NAME, applicationPathProvider_->getResourcePath("/images/logo-icon-32.png"), systemTray->getQSystemTrayIcon());
 #elif defined(SWIFTEN_PLATFORM_LINUX)
     notifier_ = new FreeDesktopNotifier(SWIFT_APPLICATION_NAME);
 #elif defined(SWIFTEN_PLATFORM_MACOSX)
     notifier_ = new NotificationCenterNotifier();
 #else
     notifier_ = new NullNotifier();
 #endif
 
 #if defined(SWIFTEN_PLATFORM_MACOSX)
     dock_ = new MacOSXDock(&cocoaApplication_);
 #else
     dock_ = new NullDock();
 #endif
 
 #if defined(SWIFTEN_PLATFORM_MACOSX)
     uriHandler_ = new QtURIHandler();
 #elif defined(SWIFTEN_PLATFORM_WIN32)
     uriHandler_ = new NullURIHandler();
 #else