[PATCH] ebook backend: separate concatenated vcards with \r\n.

[PATCH] ebook backend: separate concatenated vcards with \r\n.

[Marcel Mol]

The END:VCARD is not ended with \r\n for single vcards.
In a phonebook pull request vcards are concatenated as one
big blob. Carkits seem to choke on the fact that an END:VCARD
is directly followed by BEGIN:VCARD without \r\n separation.
(as observed by many n900 users).
---
 plugins/phonebook-ebook.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/plugins/phonebook-ebook.c b/plugins/phonebook-ebook.c
index ad40be3..da68ac0 100644
--- a/plugins/phonebook-ebook.c
+++ b/plugins/phonebook-ebook.c
@@ -175,8 +175,11 @@ static void ebookpull_cb(EBook *book, EBookStatus estatus, GList *contacts,
 						data->params->filter);
 
 		string = g_string_append(string, vcard);
+		string = g_string_append(string, "\r\n");
 		g_free(vcard);
 	}
+	DBG("collected %d vcards", count);
+
 
 done:
 	data->cb(string->str, string->len, count, 0, data->user_data);
-- 
1.7.2

Re: [PATCH] ebook backend: separate concatenated vcards with \r\n.

[Johan Hedberg]

Hi Marcel,

On Thu, Aug 12, 2010, Marcel Mol wrote:
> The END:VCARD is not ended with \r\n for single vcards.
> In a phonebook pull request vcards are concatenated as one
> big blob. Carkits seem to choke on the fact that an END:VCARD
> is directly followed by BEGIN:VCARD without \r\n separation.
> (as observed by many n900 users).
> ---
>  plugins/phonebook-ebook.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)

This one is also upstream now. Thanks.

Johan