stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed compilation with latest swiften

Browse source
This commit is contained in:
HanzZ 2011-09-26 21:09:41 +02:00
parent c0196d8dc1
commit 19786b3bb7
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/Swiften/Network/DummyNetworkFactories.h
View file

@ -32,6 +32,10 @@ namespace Swift {
return connectionServerFactory;
}
virtual Swift::NATTraverser* getNATTraverser() const {
return 0;
}
private:
TimerFactory* timerFactory;
ConnectionFactory* connectionFactory;

6
spectrum_manager/src/CMakeLists.txt
View file

@ -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

8
src/conversation.cpp
View file

@ -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()) {