diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index f10fad3c85..531c07ec44 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2000-10-19 Christopher James Lahey <clahey@helixcode.com> + + * backend/ebook/e-card.c: Change how the extension field acts when + converting delivery addresses to labels. + 2000-10-18 Christopher James Lahey <clahey@helixcode.com> * backend/ebook/e-card.c, backend/ebook/e-card.h: Added the diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index e6e9d85763..1a6fa8f9a0 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -1172,15 +1172,13 @@ e_card_delivery_address_from_label(const ECardAddrLabel *label) char * e_card_delivery_address_to_string(const ECardDeliveryAddress *addr) { - char *strings[4], **stringptr = strings; + char *strings[5], **stringptr = strings; char *line1, *line22, *line2; char *final; if (addr->po && *addr->po) *(stringptr++) = addr->po; if (addr->street && *addr->street) *(stringptr++) = addr->street; - if (addr->ext && *addr->ext) - *(stringptr++) = addr->ext; *stringptr = NULL; line1 = g_strjoinv(" ", strings); stringptr = strings; @@ -1200,6 +1198,8 @@ e_card_delivery_address_to_string(const ECardDeliveryAddress *addr) stringptr = strings; if (line1 && *line1) *(stringptr++) = line1; + if (addr->ext && *addr->ext) + *(stringptr++) = addr->ext; if (line2 && *line2) *(stringptr++) = line2; if (addr->country && *addr->country) |