** Fix for bug #518569

2008-02-25  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #518569

	* backends/ldap/e-book-backend-ldap.c: (member_populate):
	* backends/groupwise/e-book-backend-groupwise.c:
	(populate_contact_members):
	Properly format name and address with "<>" characters.

svn path=/trunk/; revision=8531

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ef46bbc..721df95 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-25  Milan Crha  <mcrha@redhat.com>
+
+       ** Fix for bug #518569
+
+       * backends/ldap/e-book-backend-ldap.c: (member_populate):
+       * backends/groupwise/e-book-backend-groupwise.c:
+       (populate_contact_members):
+       Properly format name and address with "<>" characters.
+
 2008-02-25  Tor Lillqvist  <tml@novell.com>
 
        * tests/ebook/test-changes.c (main): Use g_mkstemp() for portability.

diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 8b308aa..8fff672 100644 (file)
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -770,9 +770,9 @@ populate_contact_members (EContact *contact, gpointer data)
                        char *value;
 
                        if (member->name [0] == '\"' && member->name [len - 1] == '\"')
-                               value = g_strdup_printf ("%s %s", member->name, member->email);
+                               value = g_strdup_printf ("%s <%s>", member->name, member->email);
                        else
-                               value = g_strdup_printf ("\"%s\" %s", member->name, member->email);
+                               value = g_strdup_printf ("\"%s\" <%s>", member->name, member->email);
 
                        e_vcard_attribute_add_value (attr, value);
                        g_free (value);

diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 0f6e229..d4b0dc1 100644 (file)
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -2576,9 +2576,9 @@ member_populate (EContact *contact, char **values)
                        char *value;
 
                        if (member_info [2][0] == '\"' && member_info [2][len - 1] == '\"')
-                               value = g_strdup_printf ("%s %s", member_info [2], member_info [0]);
+                               value = g_strdup_printf ("%s <%s>", member_info [2], member_info [0]);
                        else
-                               value = g_strdup_printf ("\"%s\" %s", member_info [2], member_info [0]);
+                               value = g_strdup_printf ("\"%s\" <%s>", member_info [2], member_info [0]);
 
                        e_vcard_attribute_add_value (attr, value);
                        g_free (value);