diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/conduit/address-conduit.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 50c246832d..e1b0f061f0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2004-06-18 Jeffrey Stedfast <fejj@novell.com> + + * conduit/address-conduit.c (ecard_from_remote_record): Always set + the File_As attribute in case the pilot attrib changed. Fixes bug + #59723. + 2004-06-18 Chris Toshok <toshok@ximian.com> * gui/component/select-names/e-select-names-model.c diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index bb10015419..478173e751 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -984,7 +984,6 @@ ecard_from_remote_record(EAddrConduitContext *ctxt, char *txt, *find, *full_name; EContactField next_mail, next_home, next_work, next_fax; EContactField next_other, next_main, next_pager, next_mobile; - const char *file_as; int i; g_return_val_if_fail(remote!=NULL,NULL); @@ -1007,9 +1006,7 @@ ecard_from_remote_record(EAddrConduitContext *ctxt, g_free (full_name); /* File As */ - file_as = e_contact_get_const (contact, E_CONTACT_FILE_AS); - if (!file_as || *file_as == '\0') - set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany); + set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany); /* Title and Company */ set_contact_text (contact, E_CONTACT_TITLE, address, entryTitle); |