Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-09-15 10:25:49 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-09-15 10:25:49 (GMT) |
| commit | a8a3cc2ba4392f7b4f6c31dc60109cdd174e8827 (patch) | |
| tree | 69e74db735933da45defe0576ca33cf22549ed1e | |
| parent | ca8ee84e53e7d4910a7c17cf05e70b0b3377c9c3 (diff) | |
| download | swift-a8a3cc2ba4392f7b4f6c31dc60109cdd174e8827.zip swift-a8a3cc2ba4392f7b4f6c31dc60109cdd174e8827.tar.bz2 | |
Use last activity for requesting history again in MUCs without experimental
| -rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 6a8cbcf..50eee68 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -199,10 +199,13 @@ void MUCController::rejoin() { if (lastActivity_ == boost::posix_time::not_a_date_time && historyController_) { lastActivity_ = historyController_->getLastTimeStampFromMUC(selfJID_, toJID_); } - muc_->joinWithContextSince(nick_, lastActivity_); -#else - muc_->joinAs(nick_); #endif + if (lastActivity_ == boost::posix_time::not_a_date_time) { + muc_->joinAs(nick_); + } + else { + muc_->joinWithContextSince(nick_, lastActivity_); + } } } |