diff options
| -rw-r--r-- | e-util/ChangeLog | 8 | ||||
| -rw-r--r-- | e-util/ename/e-address-western.c | 16 |
2 files changed, 15 insertions, 9 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 3c522366fd..391046c654 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2003-03-13 Dan Winship <danw@ximian.com> + + * ename/e-address-western.c (e_address_western_parse): When + declaring a line to be part of "extended" because we don't know + what else to call it, keep the preceding "\n" so that the address + still looks the same when we reassemble the pieces later. Fixes + handling of non-US addresses + 2003-03-12 Dan Winship <danw@ximian.com> * e-xml-hash-utils.c (e_xml_to_hash): Update for a libxml2 change diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c index f2200a9dba..9d325f1384 100644 --- a/e-util/ename/e-address-western.c +++ b/e-util/ename/e-address-western.c @@ -399,15 +399,13 @@ e_address_western_parse (const gchar *in_address) &eaw->extended ); } else { - if (eaw->extended == NULL) { - eaw->extended = g_strdup (lines[cntr]); - } - else { - gchar *temp; - temp = g_strconcat (eaw->extended, "\n", lines[cntr], NULL); - g_free (eaw->extended); - eaw->extended = temp; - } + gchar *temp; + temp = g_strdup_printf ( + "%s\n%s", + eaw->extended ? eaw->extended: "", + lines[cntr]); + g_free (eaw->extended); + eaw->extended = temp; } } } |