conversion/kabcconversion.cpp

Christian Mollekopf mollekopf at kolabsys.com
Tue Nov 12 11:23:07 CET 2013


 conversion/kabcconversion.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7b064eb52225198dbc3c41aa88b9010bb24d5ebc
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue Nov 12 11:22:31 2013 +0100

    Only set the affiliation if it is not empty.
    
    Otherwise we get lots of log messages from libkolabxml for skipping empty affiliations.

diff --git a/conversion/kabcconversion.cpp b/conversion/kabcconversion.cpp
index 566652f..76d9597 100644
--- a/conversion/kabcconversion.cpp
+++ b/conversion/kabcconversion.cpp
@@ -660,7 +660,9 @@ Kolab::Contact fromKABC(const KABC::Addressee &addressee)
     if (!relateds.empty()) {
         businessAff.setRelateds(relateds);
     }
-    c.setAffiliations(std::vector<Kolab::Affiliation>() << businessAff);
+    if (!(businessAff == Kolab::Affiliation())) {
+        c.setAffiliations(std::vector<Kolab::Affiliation>() << businessAff);
+    }
     
     std::vector<Kolab::Url> urls;
     if (!addressee.url().isEmpty()) {




More information about the commits mailing list