Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

	package/src/org/maemo/hermes/engine/hermes.py

diff --git a/package/src/org/maemo/hermes/engine/hermes.py b/package/src/org/maemo/hermes/engine/hermes.py
index b103760..c9c4c91 100644 (file)
--- a/package/src/org/maemo/hermes/engine/hermes.py
+++ b/package/src/org/maemo/hermes/engine/hermes.py
@@ -149,11 +149,11 @@ class Hermes:
     # -----------------------------------------------------------------------
     def _create_empty_contact(self, friend):
         econtact = evolution.ebook.EContact()
-        econtact.props.full_name = friend['name']
         econtact.props.given_name = friend['first_name']
         econtact.props.family_name = friend['last_name']
+        econtact.props.full_name = friend.get_name()
         return econtact
     
     # -----------------------------------------------------------------------
     def _create_contact_wrapper(self, econtact):
-        return Contact(self.address_book, econtact)
\ No newline at end of file
+        return Contact(self.address_book, econtact)