aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2011-10-20 17:32:52 +0800
committerDan Vrátil <dvratil@redhat.com>2011-10-20 17:35:25 +0800
commitafb4c429a11a2a73c579f5fe68cb5f9c885c783c (patch)
tree287612c18756f0d2c1caf327adfe07ba59737f60 /addressbook/gui
parentca84e1012daa1a4bf16a273c29b547aa4a276d01 (diff)
downloadgsoc2013-evolution-afb4c429a11a2a73c579f5fe68cb5f9c885c783c.tar.gz
gsoc2013-evolution-afb4c429a11a2a73c579f5fe68cb5f9c885c783c.tar.zst
gsoc2013-evolution-afb4c429a11a2a73c579f5fe68cb5f9c885c783c.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/gui')
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c7
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 c951b290c7..fefb937ac3 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -952,6 +952,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;
@@ -959,6 +962,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;