Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-12 08:40:31 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-12 08:40:31 (GMT) |
| commit | 0fa21303c2ea99ff8b89507889de82f768978f23 (patch) | |
| tree | 9ecc89ef3f6f44b8ba13c0331ceaab468d905dc4 /Swift/Controllers/XMPPRosterController.cpp | |
| parent | c12c34c5487c2efdd5b6a91ec7f17d5911c20206 (diff) | |
| download | swift-0fa21303c2ea99ff8b89507889de82f768978f23.zip swift-0fa21303c2ea99ff8b89507889de82f768978f23.tar.bz2 | |
Do not handle IQs directly in XMPPRosterController.
XMPPRosterController now uses a RosterPushResponder to handle roster
pushes.
Diffstat (limited to 'Swift/Controllers/XMPPRosterController.cpp')
| -rw-r--r-- | Swift/Controllers/XMPPRosterController.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Swift/Controllers/XMPPRosterController.cpp b/Swift/Controllers/XMPPRosterController.cpp index 8385f65..46fb40c 100644 --- a/Swift/Controllers/XMPPRosterController.cpp +++ b/Swift/Controllers/XMPPRosterController.cpp @@ -21,13 +21,8 @@ namespace Swift { /** * The controller does not gain ownership of these parameters. */ -XMPPRosterController::XMPPRosterController(IQRouter* iqRouter, boost::shared_ptr<XMPPRoster> xmppRoster) - : iqRouter_(iqRouter), xmppRoster_(xmppRoster) { - iqRouter_->addHandler(this); -} - -XMPPRosterController::~XMPPRosterController() { - iqRouter_->removeHandler(this); +XMPPRosterController::XMPPRosterController(IQRouter* iqRouter, boost::shared_ptr<XMPPRoster> xmppRoster) : iqRouter_(iqRouter), rosterPushResponder_(iqRouter), xmppRoster_(xmppRoster) { + rosterPushResponder_.onRosterReceived.connect(boost::bind(&XMPPRosterController::handleRosterReceived, this, _1)); } void XMPPRosterController::requestRoster() { @@ -46,13 +41,4 @@ void XMPPRosterController::handleRosterReceived(boost::shared_ptr<RosterPayload> } } -bool XMPPRosterController::handleIQ(boost::shared_ptr<IQ> iq) { - if (iq->getType() != IQ::Set || iq->getPayload<RosterPayload>().get() == NULL || iq->getFrom().isValid()) { - return false; - } - handleRosterReceived(iq->getPayload<RosterPayload>()); - return true; -} - } - |