Fixed some issues with special characters and adding contact to address book.

[jenirok] / src / common / contactmanager.cpp

diff --git a/src/common/contactmanager.cpp b/src/common/contactmanager.cpp
index bb8c675..f9047b5 100644 (file)
--- a/src/common/contactmanager.cpp
+++ b/src/common/contactmanager.cpp
@@ -123,14 +123,16 @@ void ContactManager::stringToName(QString const& strname, ContactManager::Name&
 
     if(ename)
     {
-        name.firstname = QString(ename->given);
-        name.surname = QString(ename->family);
+        QString additional = QString::fromUtf8(ename->additional);
 
-        QString additional = QString(ename->additional);
-
-        if(!additional.isEmpty())
+        if(additional.isEmpty())
+        {
+            name.firstname = QString::fromUtf8(ename->given);
+            name.surname = QString::fromUtf8(ename->family);
+        }
+        else
         {
-            name.firstname += " " + additional;
+            name.surname = strname;
         }
 
         e_contact_name_free(ename);