3 files changed, 2 insertions, 11 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 4b3d716..7e2aafe 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -43,9 +43,6 @@ if myenv.get("HAVE_GROWL", False) :
     myenv.Append(CPPDEFINES = ["HAVE_GROWL"])
 if myenv["swift_mobile"] :
     myenv.Append(CPPDEFINES = ["SWIFT_MOBILE"])
-if myenv.get("HAVE_SNARL", False) :
-    myenv.UseFlags(myenv["SNARL_FLAGS"])
-    myenv.Append(CPPDEFINES = ["HAVE_SNARL"])
 if myenv.get("HAVE_HUNSPELL", True):
     myenv.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
     myenv.UseFlags(myenv["HUNSPELL_FLAGS"])
diff --git a/Swift/QtUI/WindowsNotifier.cpp b/Swift/QtUI/WindowsNotifier.cpp
index c954fab..d6e8ba9 100644
--- a/Swift/QtUI/WindowsNotifier.cpp
+++ b/Swift/QtUI/WindowsNotifier.cpp
@@ -20,20 +20,14 @@ 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()));
 }
 
 WindowsNotifier::~WindowsNotifier() {
-    delete snarlNotifier;
     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;
diff --git a/Swift/QtUI/WindowsNotifier.h b/Swift/QtUI/WindowsNotifier.h
index fae0795..945ef6b 100644
--- a/Swift/QtUI/WindowsNotifier.h
+++ b/Swift/QtUI/WindowsNotifier.h
@@ -11,11 +11,12 @@
 #include <QObject>
 
 #include <SwifTools/Notifier/Notifier.h>
-#include <SwifTools/Notifier/SnarlNotifier.h>
 
 class QSystemTrayIcon;
 
 namespace Swift {
+    class Win32NotifierWindow;
+
     class WindowsNotifier : public QObject, public Notifier {
             Q_OBJECT
 
@@ -32,7 +33,6 @@ namespace Swift {
         private:
             QSystemTrayIcon* tray;
             Win32NotifierWindow* notifierWindow;
-            SnarlNotifier* snarlNotifier;
             boost::function<void()> lastCallback;
     };
 }