Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:36:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:36:48 (GMT) |
| commit | dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8 (patch) | |
| tree | f01fe3ff891a815b7c7db511ddbabcc67f916445 /Swiften | |
| parent | a7d213975040a1130ac136d61a055c5b6f5d41fa (diff) | |
| parent | a59af6c6daa72dd491189335cf2d255a788eb0f6 (diff) | |
| download | swift-contrib-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.zip swift-contrib-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
BuildTools
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Avatars/AvatarManager.cpp | 6 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarManager.h | 4 | ||||
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.cpp | 2 | ||||
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.h | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/Swiften/Avatars/AvatarManager.cpp b/Swiften/Avatars/AvatarManager.cpp index 42451af..3825ffd 100644 --- a/Swiften/Avatars/AvatarManager.cpp +++ b/Swiften/Avatars/AvatarManager.cpp @@ -27,6 +27,10 @@ AvatarManager::~AvatarManager() { } +void AvatarManager::setMUCRegistry(MUCRegistry* mucRegistry) { + mucRegistry_ = mucRegistry; +} + void AvatarManager::handlePresenceReceived(boost::shared_ptr<Presence> presence) { boost::shared_ptr<VCardUpdate> update = presence->getPayload<VCardUpdate>(); if (!update) { @@ -97,7 +101,7 @@ boost::filesystem::path AvatarManager::getAvatarPath(const JID& jid) const { JID AvatarManager::getAvatarJID(const JID& jid) const { JID bareFrom = jid.toBare(); - return (mucRegistry_->isMUC(bareFrom) ? jid : bareFrom); + return (mucRegistry_ && mucRegistry_->isMUC(bareFrom)) ? jid : bareFrom; } diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h index 448526e..fd308d9 100644 --- a/Swiften/Avatars/AvatarManager.h +++ b/Swiften/Avatars/AvatarManager.h @@ -19,9 +19,11 @@ namespace Swift { class AvatarManager { public: - AvatarManager(StanzaChannel*, IQRouter*, AvatarStorage*, MUCRegistry*); + AvatarManager(StanzaChannel*, IQRouter*, AvatarStorage*, MUCRegistry* = NULL); virtual ~AvatarManager(); + virtual void setMUCRegistry(MUCRegistry*); + virtual String getAvatarHash(const JID&) const; virtual boost::filesystem::path getAvatarPath(const JID&) const; virtual void setAvatar(const JID&, const ByteArray& avatar); diff --git a/Swiften/MUC/MUCBookmarkManager.cpp b/Swiften/MUC/MUCBookmarkManager.cpp index f789300..f9295e2 100644 --- a/Swiften/MUC/MUCBookmarkManager.cpp +++ b/Swiften/MUC/MUCBookmarkManager.cpp @@ -11,6 +11,7 @@ MUCBookmarkManager::MUCBookmarkManager(IQRouter* iqRouter) { void MUCBookmarkManager::addBookmark(boost::shared_ptr<MUCBookmark> bookmark) { bookmarks_.push_back(bookmark); flush(); + onBookmarkAdded(bookmark); } @@ -19,6 +20,7 @@ void MUCBookmarkManager::removeBookmark(boost::shared_ptr<MUCBookmark> bookmark) for (it = bookmarks_.begin(); it != bookmarks_.end(); it++) { if ((*it).get() == bookmark.get()) { bookmarks_.erase(it); + onBookmarkRemoved(bookmark); return; } } diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h index e1f8708..ade2e3e 100644 --- a/Swiften/MUC/MUCBookmarkManager.h +++ b/Swiften/MUC/MUCBookmarkManager.h @@ -18,7 +18,8 @@ namespace Swift { void flush(); /** Returns pointers to the bookmarks. These can be edited, and then flush()ed.*/ const std::vector<boost::shared_ptr<MUCBookmark> >& getBookmarks(); - boost::signal<void ()> onBookmarksChanged; + boost::signal<void (boost::shared_ptr<MUCBookmark>)> onBookmarkAdded; + boost::signal<void (boost::shared_ptr<MUCBookmark>)> onBookmarkRemoved; private: std::vector<boost::shared_ptr<MUCBookmark> > bookmarks_; |