Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2014-06-22 12:17:10 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-06-27 11:12:42 (GMT) |
| commit | f90a0307a16a93376270a84be61451faa9bd9701 (patch) | |
| tree | bae7b33f41ef8da5319b8e4066107df2a7cafaf8 /Swift/Controllers | |
| parent | 59c3d7532b7768c6ab0c8cf6f4c587206c080c14 (diff) | |
| download | swift-contrib-f90a0307a16a93376270a84be61451faa9bd9701.zip swift-contrib-f90a0307a16a93376270a84be61451faa9bd9701.tar.bz2 | |
Fix compiler warning
Change-Id: I847677a3f99412cfa030c8f65e08890e64fce24d
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h b/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h index d6e069f..2265c3b 100644 --- a/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h +++ b/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h @@ -9,44 +9,45 @@ * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #pragma once #include <Swiften/Roster/XMPPRoster.h> #include <Swiften/Elements/MUCInvitationPayload.h> #include <Swift/Controllers/Settings/SettingsProvider.h> #include <Swift/Controllers/SettingConstants.h> namespace Swift { class AutoAcceptMUCInviteDecider { public: AutoAcceptMUCInviteDecider(const JID& domain, XMPPRoster* roster, SettingsProvider* settings) : domain_(domain), roster_(roster), settings_(settings) { } bool isAutoAcceptedInvite(const JID& from, MUCInvitationPayload::ref invite) { if (!invite->getIsImpromptu()) { return false; /* always ask the user for normal MUC invites */ } if (invite->getIsContinuation()) { return true; } std::string auto_accept_mode = settings_->getSetting(SettingConstants::INVITE_AUTO_ACCEPT_MODE); if (auto_accept_mode == "no") { return false; } else if (auto_accept_mode == "presence") { return roster_->getSubscriptionStateForJID(from) == RosterItemPayload::From || roster_->getSubscriptionStateForJID(from) == RosterItemPayload::Both; } else if (auto_accept_mode == "domain") { return roster_->getSubscriptionStateForJID(from) == RosterItemPayload::From || roster_->getSubscriptionStateForJID(from) == RosterItemPayload::Both || from.getDomain() == domain_; } else { assert(false); + return false; } } private: JID domain_; XMPPRoster* roster_; SettingsProvider* settings_; }; } |