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

[Renato Araujo Oliveira Filho]

Update server contact cache with the new contact info if update operation finish without error.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'common/vcard-parser.cpp'
--- common/vcard-parser.cpp	2013-06-23 22:38:25 +0000
+++ common/vcard-parser.cpp	2013-06-23 22:38:25 +0000
@@ -81,7 +81,8 @@
 
         virtual void contactProcessed(const QContact& contact, QVersitDocument* document)
         {
-            //nothing
+            Q_UNUSED(contact);
+            document->removeProperties("X-QTPROJECT-EXTENDED-DETAIL");
         }
     };
 

=== modified file 'src/qindividual.cpp'
--- src/qindividual.cpp	2013-06-23 22:38:25 +0000
+++ src/qindividual.cpp	2013-06-23 22:38:25 +0000
@@ -285,7 +285,6 @@
             qWarning() << "NO PERSONA";
             return defaultPersona;
         } else {
-
             GeeSet *personas = folks_individual_get_personas(individual);
             QStringList index = uri.split(".");
             Q_ASSERT(index.count() >= 1);
@@ -1410,11 +1409,11 @@
     }
 
     if (data->m_details.isEmpty()) {
+        data->m_self->m_contact = data->m_newContact;
         updateDetailsSendReply(data, 0);
         return;
     }
 
-
     data->m_currentDetail = data->m_details.takeFirst();
     switch(data->m_currentDetail.type()) {
     case QContactDetail::TypeAddress:
@@ -1501,7 +1500,6 @@
             g_object_ref(m_individual);
         }
         // initialize qcontact
-        m_contact = QContact();
         updateContact();
     }
 }
@@ -1708,8 +1706,6 @@
 {
     static QMap<QString, int> map;
 
-    qDebug() << "PArse paramater:" << parameters;
-
     // populate the map once
     if (map.isEmpty()) {
         map["home"] = QContactDetail::ContextHome;
@@ -1730,8 +1726,6 @@
         parameters.removeOne(param);
     }
 
-    qDebug() << "PArseed paramater (DONE):" << parameters;
-
     return values;
 }