From 5ba7e1862f602b014e722e09e5dd7ff902fe620c Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sat, 30 Jun 2007 19:30:53 +0000 Subject: ** Fix for bug #334140 svn path=/trunk/; revision=33733 --- plugins/bbdb/ChangeLog | 6 ++++++ plugins/bbdb/bbdb.c | 12 ++++++++++++ 2 files changed, 18 insertions(+) (limited to 'plugins/bbdb') diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index ca872a47d6..922fade265 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,9 @@ +2007-06-25 Milan Crha + + ** Fix for bug #334140 + + * bbdb.c: (bbdb_do_it): Strip '\"' out of name part, if exists. + 2007-06-07 Gilles Dartiguelongue * gaimbuddies.c: (get_node_text), (parse_contact): more compilation diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 0145f63a78..8085eaf657 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -195,6 +195,18 @@ bbdb_do_it (EBook *book, const char *name, const char *email) return; } + if (g_utf8_strchr (name, -1, '\"')) { + GString *tmp = g_string_new (name); + gchar *p; + + while (p = g_utf8_strchr (tmp->str, tmp->len, '\"'), p) + tmp = g_string_erase (tmp, p - tmp->str, 1); + + g_free (temp_name); + temp_name = g_string_free (tmp, FALSE); + name = temp_name; + } + /* If a contact exists with this name, add the email address to it. */ query_string = g_strdup_printf ("(is \"full_name\" \"%s\")", name); query = e_book_query_from_string (query_string); -- cgit v1.2.3