diff options
| author | Dan Vrátil <dvratil@redhat.com> | 2011-10-20 17:32:52 +0800 |
|---|---|---|
| committer | Dan Vrátil <dvratil@redhat.com> | 2011-10-20 17:32:52 +0800 |
| commit | 998b3d148ea7d47aed945b9ba74671b06e1d9dcf (patch) | |
| tree | 76a26d33e094321ed4c90977c64762dda853968a /addressbook | |
| parent | 31babe7961a6ef93419970a6d10c8843b671b466 (diff) | |
| download | gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.tar gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.tar.gz gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.tar.bz2 gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.tar.lz gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.tar.xz gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.tar.zst gsoc2013-evolution-998b3d148ea7d47aed945b9ba74671b06e1d9dcf.zip | |
Bug #661409 - Contact display drops address lines
Evo trets first line of a multi-line address field as a street name
and the rest as "extended address", regardless of its content.
The address-formatting code was ignoring the extended address, thus
when the first line was for example a company name, the actual street
was ignored.
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 09830a94ae..eb98676169 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -964,6 +964,9 @@ parse_address_template_section (const gchar *format, case 's': if (address->street && *(address->street)) { g_string_append (res, address->street); + if (address->ext && *(address->ext)) + g_string_append_printf (res, "\n%s", + address->ext); ret = TRUE; } pos += 2; @@ -971,6 +974,10 @@ parse_address_template_section (const gchar *format, case 'S': if (address->street && *(address->street)) { string_append_upper (res, address->street); + if (address->ext && *(address->ext)) { + g_string_append (res, "\n"); + string_append_upper (res, address->ext); + } ret = TRUE; } pos += 2; |