Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-04-12 08:39:01 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-04-12 09:50:36 (GMT) |
| commit | b4604f14389aa6276f6d2c3bff2a873b4dfe0913 (patch) | |
| tree | 16b2ed35043c812f88951562ed9ce71c0712f1ac /Swift/Controllers/RosterController.h | |
| parent | 4c0cec9c9b58f823ef92cbf55e2138e82665beef (diff) | |
| download | swift-b4604f14389aa6276f6d2c3bff2a873b4dfe0913.zip swift-b4604f14389aa6276f6d2c3bff2a873b4dfe0913.tar.bz2 | |
Send roster set before roster add.
Diffstat (limited to 'Swift/Controllers/RosterController.h')
| -rw-r--r-- | Swift/Controllers/RosterController.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Swift/Controllers/RosterController.h b/Swift/Controllers/RosterController.h index 32e3be6..d5a97a9 100644 --- a/Swift/Controllers/RosterController.h +++ b/Swift/Controllers/RosterController.h @@ -10,6 +10,7 @@ #include "Swiften/JID/JID.h" #include "Swiften/Base/String.h" #include "Swiften/Elements/Presence.h" +#include "Swiften/Elements/RosterPayload.h" #include "Swiften/Roster/UserRosterAction.h" #include "Swiften/Avatars/AvatarManager.h" #include "Swift/Controllers/UIEvents/UIEvent.h" @@ -30,10 +31,11 @@ namespace Swift { class EventController; class SubscriptionRequestEvent; class UIEventStream; + class IQRouter; class RosterController { public: - RosterController(const JID& jid, boost::shared_ptr<XMPPRoster> xmppRoster, AvatarManager* avatarManager, MainWindowFactory* mainWindowFactory, TreeWidgetFactory* treeWidgetFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, EventController* eventController, UIEventStream* uiEventStream); + RosterController(const JID& jid, boost::shared_ptr<XMPPRoster> xmppRoster, AvatarManager* avatarManager, MainWindowFactory* mainWindowFactory, TreeWidgetFactory* treeWidgetFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, EventController* eventController, UIEventStream* uiEventStream, IQRouter* iqRouter_); ~RosterController(); void showRosterWindow(); MainWindow* getWindow() {return mainWindow_;}; @@ -59,6 +61,7 @@ namespace Swift { void handleSubscriptionRequestAccepted(SubscriptionRequestEvent* event); void handleSubscriptionRequestDeclined(SubscriptionRequestEvent* event); void handleUIEvent(boost::shared_ptr<UIEvent> event); + void handleRosterSetError(boost::optional<ErrorPayload> error, boost::shared_ptr<RosterPayload> rosterPayload); JID myJID_; boost::shared_ptr<XMPPRoster> xmppRoster_; MainWindowFactory* mainWindowFactory_; @@ -70,6 +73,7 @@ namespace Swift { NickResolver* nickResolver_; PresenceOracle* presenceOracle_; EventController* eventController_; + IQRouter* iqRouter_; boost::bsignals::scoped_connection joinMUCConnection_; boost::bsignals::scoped_connection changeStatusConnection_; boost::bsignals::scoped_connection showOfflineConnection_; |