[SCM] libkpeople packaging branch, master, updated. 3271475de8af19805c1ed396583c7ef211de8a8a

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkpeople.git;a=commitdiff;h=0d6f4c5

The following commit has been merged in the master branch:
commit 0d6f4c57a1c0a21c52540cf60a9f170f3db91d11
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Oct 22 19:31:22 2013 +0200

    Make merge person job syncronous
    
    BUG:325975
    REVIEW: 113407
---
 src/personsmodel.cpp |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/personsmodel.cpp b/src/personsmodel.cpp
index 5865740..536fa16 100644
--- a/src/personsmodel.cpp
+++ b/src/personsmodel.cpp
@@ -634,6 +634,19 @@ KJob* PersonsModel::createPersonFromUris(const QList<QUrl> &uris)
         kWarning() << "not implemented yet";
     }
 
+    //TODO
+    //This makes the job synchronous, which is bad.. but there's already a synchronous call in this method anyway (line 591).
+    //If Soprano is blocked we already block our UI so this has little real impact
+
+    //we need some changes to make sure that if this method is called twice in quick succession for the same contacts
+    //otherwise we can end up making attaching a single contact to two different PIMO:Person's as we check if the contact is owned by a person whilst a merge
+    //job is happening asyncronously. This effectively breaks the database
+    //This cannot be fixed without a _signifcant_ refactor.
+
+    if (job) {
+        job->exec();
+    }
+
     return job;
 }
 

-- 
libkpeople packaging