Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-01 10:09:04 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-10-30 14:23:56 (GMT) |
| commit | 50a3962e4d0b16fd0316be54121cfb293c3117bd (patch) | |
| tree | dc85f9fd75c14542f5f1f00a3878891400ef2f41 /Swift/QtUI/QtChatWindow.h | |
| parent | 3a153509d27882e29456ffc7bf67d9cf32d86d52 (diff) | |
| download | swift-50a3962e4d0b16fd0316be54121cfb293c3117bd.zip swift-50a3962e4d0b16fd0316be54121cfb293c3117bd.tar.bz2 | |
Ignore DND drops of JIDs for contacts already in the conversation
Swift allows dropping contacts from group chats or the roster
on a chat window to invite them or start an impromptu chat.
With this commit Swift will ignore drops which only contain
JIDs that are already part of the conversation.
Test-Information:
Tested the described behavior with roster and room contact
drags in anonymous and non-anonymous rooms.
Change-Id: I2f06082ea4bc1140210f9f1a165bdf276a130273
Diffstat (limited to 'Swift/QtUI/QtChatWindow.h')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index 8d7db59..bbcdee7 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h | |||
| @@ -183,10 +183,12 @@ namespace Swift { | |||
| 183 | void handleSettingChanged(const std::string& setting); | 183 | void handleSettingChanged(const std::string& setting); |
| 184 | 184 | ||
| 185 | void handleOccupantSelectionChanged(RosterItem* item); | 185 | void handleOccupantSelectionChanged(RosterItem* item); |
| 186 | void handleAppendedToLog(); | 186 | void handleAppendedToLog(); |
| 187 | 187 | ||
| 188 | static std::vector<JID> jidListFromQByteArray(const QByteArray& dataBytes); | ||
| 189 | |||
| 188 | private: | 190 | private: |
| 189 | int unreadCount_; | 191 | int unreadCount_; |
| 190 | bool contactIsTyping_; | 192 | bool contactIsTyping_; |
| 191 | LastLineTracker lastLineTracker_; | 193 | LastLineTracker lastLineTracker_; |
| 192 | std::string id_; | 194 | std::string id_; |