summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-05-25 13:31:29 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-05-25 13:31:29 (GMT)
commitdb7e02a41e34af2542b5f124e083ea51fe6b497d (patch)
tree82330227c6c9eb09ff05b722358703e7aa284dd3 /Swift
parent6fca46bde36a4edf59cae5c7e334a6dc34776343 (diff)
downloadswift-contrib-db7e02a41e34af2542b5f124e083ea51fe6b497d.zip
swift-contrib-db7e02a41e34af2542b5f124e083ea51fe6b497d.tar.bz2
Don't duplicate caps info
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/MainController.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index b0a8fda..c2d31d6 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -17,15 +17,12 @@
#include "Swiften/Network/BoostTimerFactory.h"
#include "Swift/Controllers/Chat/ChatController.h"
#include "Swift/Controllers/Chat/MUCSearchController.h"
-//#include "Swift/Controllers/UIInterfaces/ChatWindowFactory.h"
#include "Swift/Controllers/Chat/ChatsManager.h"
#include "Swift/Controllers/EventController.h"
#include "Swift/Controllers/EventWindowController.h"
#include "Swift/Controllers/UIInterfaces/LoginWindow.h"
#include "Swift/Controllers/UIInterfaces/LoginWindowFactory.h"
-//#include "Swift/Controllers/UIInterfaces/EventWindowFactory.h"
#include "Swift/Controllers/UIInterfaces/MainWindow.h"
-//#include "Swift/Controllers/UIInterfaces/MainWindowFactory.h"
#include "Swift/Controllers/Chat/MUCController.h"
#include "Swift/Controllers/NickResolver.h"
#include "Swift/Controllers/ProfileSettingsProvider.h"
@@ -36,7 +33,6 @@
#include "Swift/Controllers/SystemTrayController.h"
#include "Swift/Controllers/XMLConsoleController.h"
#include "Swift/Controllers/XMPPRosterController.h"
-//#include "Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h"
#include "Swift/Controllers/UIEvents/UIEventStream.h"
#include "Swiften/Base/foreach.h"
#include "Swiften/Base/String.h"
@@ -229,7 +225,6 @@ void MainController::handleConnected() {
} else {
initialPresence = boost::shared_ptr<Presence>(new Presence());
}
- initialPresence->addPayload(capsInfo_);
setManagersEnabled(true);
sendPresence(initialPresence);
}