diff options
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ec6934dbec..b37619f9b0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,14 @@ 2002-11-26 Chris Toshok <toshok@ximian.com> + [ roll forward from 1.2 branch ] + * backend/pas/pas-backend-file.c + (pas_backend_file_process_get_vcard): never pass NULL as the vcard + to the corba call, it causes a crash. This particular bug bit us + when we opened a card that contained an unresolvable related + contact. + +2002-11-26 Chris Toshok <toshok@ximian.com> + [ roll forward from 1.2 branch, Fixes addressbook bug #28945 ] * backend/ebook/e-card.c (e_card_get_vobject): if the email property is xml, get the real address from the e-destination. diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index bc5de01458..58e1a8405a 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -922,7 +922,7 @@ pas_backend_file_process_get_vcard (PASBackend *backend, card = vcard_dbt.data; status = GNOME_Evolution_Addressbook_BookListener_Success; } else { - card = NULL; + card = ""; status = GNOME_Evolution_Addressbook_BookListener_CardNotFound; } |