Merge lp:~renatofilho/address-book-service/fix-1231397 into lp:address-book-service

[Renato Araujo Oliveira Filho]

Fixed service timeout when updating the e-mail address.

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:78
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-saucy-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-service-ci/87/rebuild

review: Approve (continuous-integration)

=== modified file 'src/update-contact-request.cpp'
--- src/update-contact-request.cpp	2013-09-24 23:31:21 +0000
+++ src/update-contact-request.cpp	2013-10-01 18:07:58 +0000
@@ -732,7 +732,12 @@
         self->updateFullName();
         break;
     case QContactDetail::TypeEmailAddress:
-        self->updateEmail();
+        //WORKAROUND: Folks automatically add online accounts based on e-mail address
+        // for example [e-mail] will create a jabber account, and this causes some
+        // confusions on the service during the update, because of that we first update
+        // the online account and this will avoid problems with the automatic update ]
+        // from folks
+        self->updateOnlineAccount();
         break;
     case QContactDetail::TypeFavorite:
         self->updateFavorite();
@@ -747,7 +752,8 @@
         self->updateNote();
         break;
     case QContactDetail::TypeOnlineAccount:
-        self->updateOnlineAccount();
+        //WORKAROUND: see TypeEmailAddress update clause
+        self->updateEmail();
         break;
     case QContactDetail::TypeOrganization:
         self->updateOrganization();