summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-10-31 14:45:27 (GMT)
committerTobias Markmann <tm@ayena.de>2014-10-31 14:45:49 (GMT)
commitb2c12f79f9c0c05a1dc9f9603d6d2aa258647391 (patch)
treebbf0eba7a9457334ae4a0d8f6113155bcca68423 /Swift/Controllers/UIInterfaces
parent0ae300e79f0a72abb42aafd2bc5b85e37fd26557 (diff)
downloadswift-b2c12f79f9c0c05a1dc9f9603d6d2aa258647391.zip
swift-b2c12f79f9c0c05a1dc9f9603d6d2aa258647391.tar.bz2
Enable unblocking contacts from cog menu.
Renamed ChatWindow::setInputEnabled to ChatWindow::setOnline. Moved some input return key disabling logic into QtChatWindow. Test-Information: Tested in Swift, blocking a contact and unblokcing it from cog menu. Return still does not do anything on blocked contacts or when offline. Change-Id: I42faffb8618598fcc7c0bd44148902ea7028258e
Diffstat (limited to 'Swift/Controllers/UIInterfaces')
-rw-r--r--Swift/Controllers/UIInterfaces/ChatWindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 6b2799b..f7b8360 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -141,7 +141,7 @@ namespace Swift {
// virtual TreeWidget *getTreeWidget() = 0;
virtual void setSecurityLabelsError() = 0;
virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() = 0;
- virtual void setInputEnabled(bool enabled) = 0;
+ virtual void setOnline(bool online) = 0;
virtual void setRosterModel(Roster* model) = 0;
virtual void setTabComplete(TabComplete* completer) = 0;
virtual void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour timestampBehaviour) = 0;