From 19786b3bb70887f37477424535f4ee74236f91f1 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Mon, 26 Sep 2011 21:09:41 +0200 Subject: [PATCH] Fixed compilation with latest swiften --- include/Swiften/Network/DummyNetworkFactories.h | 4 ++++ spectrum_manager/src/CMakeLists.txt | 6 +++--- src/conversation.cpp | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h index 50b9f338..7671b23b 100644 --- a/include/Swiften/Network/DummyNetworkFactories.h +++ b/include/Swiften/Network/DummyNetworkFactories.h @@ -32,6 +32,10 @@ namespace Swift { return connectionServerFactory; } + virtual Swift::NATTraverser* getNATTraverser() const { + return 0; + } + private: TimerFactory* timerFactory; ConnectionFactory* connectionFactory; diff --git a/spectrum_manager/src/CMakeLists.txt b/spectrum_manager/src/CMakeLists.txt index 73de569d..56543501 100644 --- a/spectrum_manager/src/CMakeLists.txt +++ b/spectrum_manager/src/CMakeLists.txt @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 2.6) FILE(GLOB SRC *.cpp) -ADD_EXECUTABLE(spectrum_manager ${SRC}) +ADD_EXECUTABLE(spectrum2_manager ${SRC}) -target_link_libraries(spectrum_manager transport) +target_link_libraries(spectrum2_manager transport) -INSTALL(TARGETS spectrum_manager RUNTIME DESTINATION bin) +INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin) INSTALL(FILES spectrum_manager.cfg diff --git a/src/conversation.cpp b/src/conversation.cpp index c4cc2e21..238fe4c8 100644 --- a/src/conversation.cpp +++ b/src/conversation.cpp @@ -106,10 +106,14 @@ void Conversation::handleParticipantChanged(const std::string &nick, int flag, i } - Swift::MUCUserPayload::Item item(Swift::MUCOccupant::Member, Swift::MUCOccupant::Participant); + Swift::MUCItem item; + + item.affiliation = Swift::MUCOccupant::Member; + item.role = Swift::MUCOccupant::Participant; if (flag & Moderator) { - item = Swift::MUCUserPayload::Item(Swift::MUCOccupant::Admin, Swift::MUCOccupant::Moderator); + item.affiliation = Swift::MUCOccupant::Admin; + item.role = Swift::MUCOccupant::Moderator; } if (!newname.empty()) {