X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsnorenotificationbackend.cpp;h=bdabcf13e3cc0b2a8fafe2abf17a81a09bef9670;hp=69ce0e0a16d186a75387b61536813116f44340b3;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=07d99f2b05f61df83278021d041d9e701a14f0d9

diff --git a/src/qtui/snorenotificationbackend.cpp b/src/qtui/snorenotificationbackend.cpp
index 69ce0e0a..bdabcf13 100644
--- a/src/qtui/snorenotificationbackend.cpp
+++ b/src/qtui/snorenotificationbackend.cpp
@@ -1,44 +1,44 @@
 /***************************************************************************
-*   Copyright (C) 2011-2013 by Patrick von Reth                           *
-*   vonreth@kde.org                                                       *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+ *   Copyright (C) 2011-2018 by Hannah von Reth                            *
+ *   vonreth@kde.org                                                       *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #include "snorenotificationbackend.h"
 
+#include <iostream>
+
 #include <QtGui>
 #include <QtGlobal>
 #include <QMetaObject>
 
+#include <libsnore/snore.h>
+#include <libsnore/notification/notification.h>
+
 #include "client.h"
+#include "icon.h"
 #include "networkmodel.h"
 #include "systraynotificationbackend.h"
 #include "qtui.h"
 
-#include <iostream>
-
-
-#include <libsnore/snore.h>
-#include <libsnore/notification/notification.h>
-
 
 SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent)
-    : AbstractNotificationBackend(parent),
-      m_icon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")))
+    : AbstractNotificationBackend(parent)
+    , m_icon(icon::get("quassel"))
 {
 
     Snore::SnoreCore::instance().loadPlugins(
@@ -50,7 +50,7 @@ SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent)
     m_application.hints().setValue("windows-app-id","QuasselProject.QuasselIRC");
     m_application.hints().setValue("pushover-token", "arNtsi983QSZUqU3KAZrFLKHGFPkdL");
 
-    connect(&Snore::SnoreCore::instance(), SIGNAL(actionInvoked(Snore::Notification)), this, SLOT(actionInvoked(Snore::Notification)));
+    connect(&Snore::SnoreCore::instance(), &Snore::SnoreCore::actionInvoked, this, &SnoreNotificationBackend::actionInvoked);
 
 
     m_alert = Snore::Alert(tr("Private Message"), m_icon);
@@ -91,7 +91,9 @@ void SnoreNotificationBackend::close(uint notificationId)
     }
 #endif
     Snore::Notification n = Snore::SnoreCore::instance().getActiveNotificationByID(m_notificationIds.take(notificationId));
-    Snore::SnoreCore::instance().requestCloseNotification(n, Snore::Notification::Closed);
+    if (n.isValid()) { // Don't close the notification if it no longer exists.
+        Snore::SnoreCore::instance().requestCloseNotification(n, Snore::Notification::Closed);
+    }
 }
 
 void SnoreNotificationBackend::actionInvoked(Snore::Notification n)
@@ -122,9 +124,13 @@ void SnoreNotificationBackend::setTraybackend(const QVariant &b)
     }
 #endif
     if (b.toBool()) {
-        Snore::SnoreCore::instance().registerApplication(m_application);
+        if (!Snore::SnoreCore::instance().aplications().contains(m_application.name())) {
+            Snore::SnoreCore::instance().registerApplication(m_application);
+        }
     } else {
-        Snore::SnoreCore::instance().deregisterApplication(m_application);
+        if (Snore::SnoreCore::instance().aplications().contains(m_application.name())) {
+            Snore::SnoreCore::instance().deregisterApplication(m_application);
+        }
     }
 }
 
@@ -134,7 +140,7 @@ SnoreNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent)
     :SettingsPage("Internal", "SnoreNotification", parent)
 {
     ui.setupUi(this);
-    connect(ui.useSnoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(useSnnoreChanged(bool)));
+    connect(ui.useSnoreCheckBox, &QCheckBox::toggled, this, &ConfigWidget::useSnoreChanged);
 }
 
 bool SnoreNotificationBackend::ConfigWidget::hasDefaults() const
@@ -144,7 +150,7 @@ bool SnoreNotificationBackend::ConfigWidget::hasDefaults() const
 
 void SnoreNotificationBackend::ConfigWidget::defaults()
 {
-    useSnnoreChanged(false);
+    useSnoreChanged(false);
     ui.widget->reset();
 }
 
@@ -166,7 +172,7 @@ void SnoreNotificationBackend::ConfigWidget::save()
     load();
 }
 
-void SnoreNotificationBackend::ConfigWidget::useSnnoreChanged(bool b)
+void SnoreNotificationBackend::ConfigWidget::useSnoreChanged(bool b)
 {
     ui.useSnoreCheckBox->setChecked(b);
     ui.widget->setEnabled(b);