summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-04-27 14:32:23 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-27 14:32:23 (GMT)
commitc1944713513ae5262e9960a7ef391f4bb915e999 (patch)
treef8fecaec7c263cd15752d8535a09cc3f534f13dc
parent75980d51d64948448bc6a1b2e2d5091a96cedb98 (diff)
downloadswift-c1944713513ae5262e9960a7ef391f4bb915e999.zip
swift-c1944713513ae5262e9960a7ef391f4bb915e999.tar.bz2
Don't spin the throbber forever when editing a contact for whom you don't yet have the vcard.
Resolves: #1111
-rw-r--r--Swift/Controllers/ContactEditController.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/ContactEditController.cpp b/Swift/Controllers/ContactEditController.cpp
index a8b171c..2117d7a 100644
--- a/Swift/Controllers/ContactEditController.cpp
+++ b/Swift/Controllers/ContactEditController.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2012 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -22,6 +22,7 @@ namespace Swift {
ContactEditController::ContactEditController(RosterController* rosterController, VCardManager* vcardManager, ContactEditWindowFactory* contactEditWindowFactory, UIEventStream* uiEventStream) : rosterController(rosterController), vcardManager(vcardManager), contactEditWindowFactory(contactEditWindowFactory), uiEventStream(uiEventStream), contactEditWindow(NULL) {
uiEventStream->onUIEvent.connect(boost::bind(&ContactEditController::handleUIEvent, this, _1));
+ vcardManager->onVCardChanged.connect(boost::bind(&ContactEditController::handleVCardChanged, this, _1, _2));
}
ContactEditController::~ContactEditController() {