X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsnorenotificationbackend.cpp;h=07c6a9a9f505762dbf0b6cbac1349cd160aa51c7;hp=6c125d988f555a34848052073976e79a475d48fc;hb=b7447afe8e836376776dac26704e227a678d2913;hpb=d3dcda30c8cbee75c0c8f500f4ab552bde513036

diff --git a/src/qtui/snorenotificationbackend.cpp b/src/qtui/snorenotificationbackend.cpp
index 6c125d98..07c6a9a9 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(
@@ -124,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);
+        }
     }
 }