summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-12-22 20:18:24 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-12-22 20:18:24 (GMT)
commit04b99ce8430109d0467c29c85cb6bacb85c54c44 (patch)
tree2c5e15de1a4d3636df7eb8530ebe864722be82c4
parent9e35dfd2f3a1fbc88bb800c8bf167035b0bd0582 (diff)
downloadswift-04b99ce8430109d0467c29c85cb6bacb85c54c44.zip
swift-04b99ce8430109d0467c29c85cb6bacb85c54c44.tar.bz2
Fixed compilation on non-Windows platforms.
-rw-r--r--SwifTools/Notifier/GNTPNotifier.cpp6
-rw-r--r--SwifTools/Notifier/SConscript1
-rw-r--r--Swift/QtUI/SConscript6
3 files changed, 8 insertions, 5 deletions
diff --git a/SwifTools/Notifier/GNTPNotifier.cpp b/SwifTools/Notifier/GNTPNotifier.cpp
index ab2ab09..924b921 100644
--- a/SwifTools/Notifier/GNTPNotifier.cpp
+++ b/SwifTools/Notifier/GNTPNotifier.cpp
@@ -4,6 +4,8 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
+// FIXME: This notifier needs finishing (handling callbacks etc.)
+
#include "SwifTools/Notifier/GNTPNotifier.h"
#include <cassert>
@@ -49,7 +51,7 @@ void GNTPNotifier::send(const std::string& message) {
currentConnection->connect(HostAddressPort(HostAddress("127.0.0.1"), 23053));
}
-void GNTPNotifier::showMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()> callback) {
+void GNTPNotifier::showMessage(Type type, const String& subject, const String& description, const boost::filesystem::path& picture, boost::function<void()>) {
if (registered) {
std::ostringstream message;
message << "GNTP/1.0 NOTIFY NONE\r\n";
@@ -74,7 +76,7 @@ void GNTPNotifier::handleConnectFinished(bool error) {
}
}
-void GNTPNotifier::handleDataRead(const ByteArray& data) {
+void GNTPNotifier::handleDataRead(const ByteArray&) {
currentConnection->onDataRead.disconnect(boost::bind(&GNTPNotifier::handleDataRead, this, _1));
currentConnection->onConnectFinished.disconnect(boost::bind(&GNTPNotifier::handleConnectFinished, this, _1));
currentConnection.reset();
diff --git a/SwifTools/Notifier/SConscript b/SwifTools/Notifier/SConscript
index 7a991e8..9ad2fd7 100644
--- a/SwifTools/Notifier/SConscript
+++ b/SwifTools/Notifier/SConscript
@@ -4,7 +4,6 @@ myenv = swiftools_env.Clone()
sources = [
"Notifier.cpp",
- "GNTPNotifier.cpp",
]
if swiftools_env.get("HAVE_GROWL", False) :
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index d9080bb..b435e34 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -92,7 +92,6 @@ sources = [
"SystemMessageSnippet.cpp",
"QtElidingLabel.cpp",
"QtLineEdit.cpp",
- "WindowsNotifier.cpp",
"Roster/RosterModel.cpp",
"Roster/QtTreeWidget.cpp",
# "Roster/QtTreeWidgetItem.cpp",
@@ -125,7 +124,10 @@ myenv["SWIFT_VERSION"] = Version.getBuildVersion("swift")
if env["PLATFORM"] == "win32" :
myenv.RES("../resources/Windows/Swift.rc")
- sources += ["../resources/Windows/Swift.res"]
+ sources += [
+ "WindowsNotifier.cpp",
+ "../resources/Windows/Swift.res"
+ ]
if env["PLATFORM"] == "posix" :
sources += ["FreeDesktopNotifier.cpp"]