summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-06-22 12:17:10 (GMT)
committerSwift Review <review@swift.im>2014-06-27 11:12:42 (GMT)
commitf90a0307a16a93376270a84be61451faa9bd9701 (patch)
treebae7b33f41ef8da5319b8e4066107df2a7cafaf8
parent59c3d7532b7768c6ab0c8cf6f4c587206c080c14 (diff)
downloadswift-contrib-f90a0307a16a93376270a84be61451faa9bd9701.zip
swift-contrib-f90a0307a16a93376270a84be61451faa9bd9701.tar.bz2
Fix compiler warning
Change-Id: I847677a3f99412cfa030c8f65e08890e64fce24d
-rw-r--r--Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h1
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
@@ -35,18 +35,19 @@ namespace Swift {
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_;
};
}