aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/conduit
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-06-19 04:36:12 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-06-19 04:36:12 +0800
commit6a61cbb421b16ebf2c1fde5eea0aa005c531d979 (patch)
tree05820eae77ed541db9b5aa7e178ac5b2faa25c5d /addressbook/conduit
parent7f972efe0d2889052fbb49dceb28af5c9e1308a6 (diff)
downloadgsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.tar
gsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.tar.gz
gsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.tar.bz2
gsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.tar.lz
gsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.tar.xz
gsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.tar.zst
gsoc2013-evolution-6a61cbb421b16ebf2c1fde5eea0aa005c531d979.zip
Always set the File_As attribute in case the pilot attrib changed. Fixes
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. svn path=/trunk/; revision=26426
Diffstat (limited to 'addressbook/conduit')
-rw-r--r--addressbook/conduit/address-conduit.c5
1 files changed, 1 insertions, 4 deletions
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);