Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-07-12 09:39:50 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-07-12 10:04:59 (GMT) |
| commit | ee22c7cde330254cd97adb9ce818b80d3b6bbbd8 (patch) | |
| tree | 59f9ffc0c482b8590e72bc2a0d90e4791ec50a5c /Swift | |
| parent | 0ea6c4a70e324c431bb4c10eab2f2de25da253e0 (diff) | |
| download | swift-ee22c7cde330254cd97adb9ce818b80d3b6bbbd8.zip swift-ee22c7cde330254cd97adb9ce818b80d3b6bbbd8.tar.bz2 | |
Remove Snarl notification support
This removes Snarl from 3rdParty, our adapter to it in
SwifTools and the integration in Swift UI.
Test-Information:
Builds and installer still work on Windows 8. Standard
system tray balloon notifications still work.
Change-Id: Id580642932eac260c79eaf2343a94ec9d5606f11
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/SConscript | 3 | ||||
| -rw-r--r-- | Swift/QtUI/WindowsNotifier.cpp | 6 | ||||
| -rw-r--r-- | Swift/QtUI/WindowsNotifier.h | 4 |
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; }; } |