1 files changed, 21 insertions, 25 deletions
diff --git a/Swift/QtUI/WindowsNotifier.cpp b/Swift/QtUI/WindowsNotifier.cpp
index 1352dfa..d6e8ba9 100644
--- a/Swift/QtUI/WindowsNotifier.cpp
+++ b/Swift/QtUI/WindowsNotifier.cpp
@@ -1,54 +1,50 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "WindowsNotifier.h"
+#include <Swift/QtUI/WindowsNotifier.h>
 
-#include <QSystemTrayIcon>
 #include <cassert>
 #include <iostream>
+
 #include <boost/bind.hpp>
 
-#include "QtWin32NotifierWindow.h"
-#include "QtSwiftUtil.h"
+#include <QSystemTrayIcon>
+
+#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/QtWin32NotifierWindow.h>
 
 namespace Swift {
 
 WindowsNotifier::WindowsNotifier(const std::string& name, const boost::filesystem::path& icon, QSystemTrayIcon* tray) : tray(tray) {
-	notifierWindow = new QtWin32NotifierWindow();
-	snarlNotifier = new SnarlNotifier(name, notifierWindow, icon);
-	connect(tray, SIGNAL(messageClicked()), SLOT(handleMessageClicked()));
+    notifierWindow = new QtWin32NotifierWindow();
+    connect(tray, SIGNAL(messageClicked()), SLOT(handleMessageClicked()));
 }
 
 WindowsNotifier::~WindowsNotifier() {
-	delete snarlNotifier;
-	delete notifierWindow;
+    delete notifierWindow;
 }
 
 void WindowsNotifier::showMessage(Type type, const std::string& subject, const std::string& description, const boost::filesystem::path& picture, boost::function<void()> callback) {
-	if (snarlNotifier->isAvailable()) {
-		snarlNotifier->showMessage(type, subject, description, picture, callback);
-		return;
-	}
-	std::vector<Notifier::Type> defaultTypes = getDefaultTypes();
-	if (std::find(defaultTypes.begin(), defaultTypes.end(), type) == defaultTypes.end()) {
-		return;
-	}
-	lastCallback = callback;
-	int timeout = (type == IncomingMessage || type == SystemMessage) ? DEFAULT_MESSAGE_NOTIFICATION_TIMEOUT_SECONDS : DEFAULT_STATUS_NOTIFICATION_TIMEOUT_SECONDS;
-	tray->showMessage(P2QSTRING(subject), P2QSTRING(description), type == SystemMessage ? QSystemTrayIcon::Information : QSystemTrayIcon::NoIcon, timeout * 1000);
+    std::vector<Notifier::Type> defaultTypes = getDefaultTypes();
+    if (std::find(defaultTypes.begin(), defaultTypes.end(), type) == defaultTypes.end()) {
+        return;
+    }
+    lastCallback = callback;
+    int timeout = (type == IncomingMessage || type == SystemMessage) ? DEFAULT_MESSAGE_NOTIFICATION_TIMEOUT_SECONDS : DEFAULT_STATUS_NOTIFICATION_TIMEOUT_SECONDS;
+    tray->showMessage(P2QSTRING(subject), P2QSTRING(description), type == SystemMessage ? QSystemTrayIcon::Information : QSystemTrayIcon::NoIcon, timeout * 1000);
 }
 
 void WindowsNotifier::handleMessageClicked() {
-	if (lastCallback) {
-		lastCallback();
-	}
+    if (lastCallback) {
+        lastCallback();
+    }
 }
 
 void WindowsNotifier::purgeCallbacks() {
-	lastCallback = boost::function<void()>();
+    lastCallback = boost::function<void()>();
 }
 
 }