From 426358b4c7b2581794cbf6b5478c132665d70338 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Thu, 19 Oct 2000 04:14:52 +0000 Subject: Change how the extension field acts when converting delivery addresses to 2000-10-19 Christopher James Lahey * backend/ebook/e-card.c: Change how the extension field acts when converting delivery addresses to labels. svn path=/trunk/; revision=6024 --- addressbook/backend/ebook/e-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addressbook/backend/ebook/e-card.c') 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) -- cgit v1.2.3