summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-11-01 20:19:05 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-11-01 20:19:05 (GMT)
commit8effa7fb6c2e341734be5392566c06e9ac38d1b7 (patch)
tree9e272145318edcc9bd5140d8591658f376bd33be
parent4cf2c5dbea1d620f824fda243c588ddf984f7737 (diff)
downloadswift-contrib-8effa7fb6c2e341734be5392566c06e9ac38d1b7.zip
swift-contrib-8effa7fb6c2e341734be5392566c06e9ac38d1b7.tar.bz2
Disable bookmarks when offline.
Resolves: #679 Release-Notes: You can no longer use bookmarks while offline.
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp2
-rw-r--r--Swift/QtUI/ChatList/QtChatListWindow.cpp3
-rw-r--r--Swiften/MUC/MUCBookmarkManager.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 0353cb9..4a9e164 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -161,7 +161,7 @@ void ChatsManager::setOnline(bool enabled) {
controllerPair.second->rejoin();
}
}
-
+ chatListWindow_->setBookmarksEnabled(enabled);
}
void ChatsManager::handleChatRequest(const String &contact) {
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index 86dfa8f..887d9a4 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -68,6 +68,9 @@ void QtChatListWindow::setupContextMenus() {
}
void QtChatListWindow::handleItemActivated(const QModelIndex& index) {
+ if (!bookmarksEnabled_) {
+ return;
+ }
ChatListItem* item = model_->getItemForIndex(index);
ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item);
if (mucItem) {
diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h
index 8067b4b..35f5447 100644
--- a/Swiften/MUC/MUCBookmarkManager.h
+++ b/Swiften/MUC/MUCBookmarkManager.h
@@ -27,7 +27,7 @@ namespace Swift {
void removeBookmark(const MUCBookmark& bookmark);
void replaceBookmark(const MUCBookmark& oldBookmark, const MUCBookmark& newBookmark);
- const std::vector<MUCBookmark>& getBookmarks() const;
+ const std::vector<MUCBookmark>& getBookmarks() const;
public:
boost::signal<void (const MUCBookmark&)> onBookmarkAdded;