Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-06-10 10:59:04 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-07-01 12:18:48 (GMT) |
| commit | b16a2d1483f59ad93a2171c6c286e12f4ebbf3be (patch) | |
| tree | f49c9ba36649797070a84955423e4611dae7dd8a /Swift/Controllers/MainController.h | |
| parent | a1be6105b97dddc1e03db0075f6ca3fc47fa8e1d (diff) | |
| download | swift-b16a2d1483f59ad93a2171c6c286e12f4ebbf3be.zip swift-b16a2d1483f59ad93a2171c6c286e12f4ebbf3be.tar.bz2 | |
Implement Message Carbons in Swift and Swift/Controllers
If the server supports message carbons, Swift will try to
enable it.
Carbon copied messages will open a chat window in the
background if no chat window exists for the conversation.
Test-Information:
Tested with a XMPP server Swift and a mobile Android client
all supporting message carbons. Tested direct messages
and MUC PM messages. All working as expected.
Added unit tests for message carbons of sent messages and
message carbons of received messages.
All unit tests pass on OS X 10.11.5
Change-Id: I8d5b5d9975651a2353909dea976f58e4bf12e014
Diffstat (limited to 'Swift/Controllers/MainController.h')
| -rw-r--r-- | Swift/Controllers/MainController.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index 5000d51..4f691ee 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -122,6 +122,7 @@ namespace Swift { void setReconnectTimer(); void resetPendingReconnects(); void resetCurrentError(); + void enableMessageCarbons(); void performLoginFromCachedCredentials(); void reconnectAfterError(); @@ -195,5 +196,6 @@ namespace Swift { HighlightManager* highlightManager_; HighlightEditorController* highlightEditorController_; std::map<std::string, std::string> emoticons_; + boost::signals2::connection enableCarbonsRequestHandlerConnection_; }; } |