From 3cb7f26ed8330dac1c41bfe66b81944e0bd1f9aa Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 5 Dec 2008 06:19:40 +0000 Subject: [PATCH] ** Fix for BNC bugs #440265 && #447121 2008-12-05 Srinivasa Ragavan ** Fix for BNC bugs #440265 && #447121 * addressbook/backends/groupwise/e-book-backend-groupwise.c: Fix some stupidity. svn path=/trunk/; revision=9799 --- addressbook/ChangeLog | 7 +++++++ addressbook/backends/groupwise/e-book-backend-groupwise.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 2e2526a..670bd95 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -22,6 +22,13 @@ * addressbook/libedata-book/e-data-book-view.c: Don't unref when things aren't reffed. +2008-12-05 Srinivasa Ragavan + + ** Fix for BNC bugs #440265 && #447121 + + * addressbook/backends/groupwise/e-book-backend-groupwise.c: Fix some + stupidity. + 2008-11-07 Sankar P ** Patch committed on behalf of Ashish Shrivastava diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c index 4a4d487..4427075 100644 --- a/addressbook/backends/groupwise/e-book-backend-groupwise.c +++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c @@ -848,6 +848,9 @@ set_members_in_gw_item (EGwItem *item, EContact *contact, EBookBackendGroupwise email = v ? v->data : NULL; } } + + if (!id && !email) + email = e_vcard_attribute_get_value (attr); if (id) { member = g_new0 (EGroupMember , 1); member->id = g_strdup (id); @@ -2020,7 +2023,7 @@ e_book_backend_groupwise_get_contact_list (EBookBackend *backend, g_object_unref (contact); } g_ptr_array_free (ids, TRUE); - ids->len = 0; + ids = NULL; } } else { -- 2.7.4