Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-09 21:29:20 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-07 13:00:23 (GMT) |
| commit | 2598ef4efcd74d5e9e701c62337bf84829572508 (patch) | |
| tree | c60d7337a9f8932ed4a1d70e606d1ce2787f866f /Swift/Controllers/ProfileController.h | |
| parent | f10c9618f8ccd9e44c9a45a69179883b39a445f5 (diff) | |
| download | swift-2598ef4efcd74d5e9e701c62337bf84829572508.zip swift-2598ef4efcd74d5e9e701c62337bf84829572508.tar.bz2 | |
Show old vCard in UI if vCard update is rejected by server
Previously QtVCardWidget would work on a shared copy of a VCard and
modify the shared version. Now when setting the vCard on the widget
it creates its own copy and works on that.
The ProfileController holds a reference to the VCard it sets on the UI.
If the server rejects an update it can reset the UI to this VCard.
Test-Information:
Tested against a XMPP server that rejects all vCard updates
(mod_readonly).
Change-Id: Iaa8eed6406f2dc6cc7ac5434194a7dae4f879b33
Diffstat (limited to 'Swift/Controllers/ProfileController.h')
| -rw-r--r-- | Swift/Controllers/ProfileController.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Swift/Controllers/ProfileController.h b/Swift/Controllers/ProfileController.h index 466834f..c6f5420 100644 --- a/Swift/Controllers/ProfileController.h +++ b/Swift/Controllers/ProfileController.h | |||
| @@ -1,16 +1,17 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swift/Controllers/UIEvents/UIEvent.h> | ||
| 10 | #include <Swiften/Elements/VCard.h> | ||
| 11 | #include <Swiften/Elements/ErrorPayload.h> | 9 | #include <Swiften/Elements/ErrorPayload.h> |
| 10 | #include <Swiften/Elements/VCard.h> | ||
| 12 | #include <Swiften/VCards/SetVCardRequest.h> | 11 | #include <Swiften/VCards/SetVCardRequest.h> |
| 13 | 12 | ||
| 13 | #include <Swift/Controllers/UIEvents/UIEvent.h> | ||
| 14 | |||
| 14 | namespace Swift { | 15 | namespace Swift { |
| 15 | class UIEventStream; | 16 | class UIEventStream; |
| 16 | class ProfileWindowFactory; | 17 | class ProfileWindowFactory; |
| @@ -40,6 +41,7 @@ namespace Swift { | |||
| 40 | SetVCardRequest::ref pendingSetVCardRequest; | 41 | SetVCardRequest::ref pendingSetVCardRequest; |
| 41 | ProfileWindow* profileWindow; | 42 | ProfileWindow* profileWindow; |
| 42 | bool gettingVCard; | 43 | bool gettingVCard; |
| 44 | VCard::ref vcardBeforeEdit; | ||
| 43 | }; | 45 | }; |
| 44 | } | 46 | } |
| 45 | 47 | ||