From 5d54b12b1cf8dbcb5cf4045ea5c747df122dad92 Mon Sep 17 00:00:00 2001
From: Jani Mustonen <janijohannes@kapsi.fi>
Date: Thu, 2 Nov 2017 21:06:43 +0200
Subject: [PATCH] Adhere to change request

---
 include/UserSettingsPage.h | 2 +-
 src/MainWindow.cc          | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/UserSettingsPage.h b/include/UserSettingsPage.h
index 50652fe6..6f6da2c5 100644
--- a/include/UserSettingsPage.h
+++ b/include/UserSettingsPage.h
@@ -66,7 +66,7 @@ protected:
 
 signals:
         void moveBack();
-        void trayOptionChanged(const bool value);
+        void trayOptionChanged(bool value);
 
 private:
         // Layouts
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 221bc83b..fd44e405 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -94,9 +94,7 @@ MainWindow::MainWindow(QWidget *parent)
                 pageStack_->setCurrentWidget(chat_page_);
         });
 
-        connect(userSettingsPage_, &UserSettingsPage::trayOptionChanged, this, [=](const bool value) {
-                trayIcon_->setVisible(value);
-        });
+        connect(userSettingsPage_, SIGNAL(trayOptionChanged(bool)), trayIcon_, SLOT(setVisible(bool)));
 
         connect(trayIcon_,
                 SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
@@ -117,7 +115,7 @@ MainWindow::MainWindow(QWidget *parent)
 
         QSettings settings;
 
-        trayIcon_->setVisible(settings.value("user/window/tray", true).toBool());
+        trayIcon_->setVisible(userSettings_->isTrayEnabled());
 
         if (hasActiveUser()) {
                 QString token       = settings.value("auth/access_token").toString();
@@ -259,8 +257,7 @@ MainWindow::showUserSettingsPage()
 void
 MainWindow::closeEvent(QCloseEvent *event)
 {
-        QSettings settings;
-        if (isVisible() && settings.value("user/window/tray", true).toBool()) {
+        if (isVisible() && userSettings_->isTrayEnabled()) {
                 event->ignore();
                 hide();
         }