diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-24 17:30:20 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-24 17:30:20 +0800 |
| commit | bd149b27954af20cf3f860164486191b0e879e89 (patch) | |
| tree | 323c26ba15a7e15242c2749b391b5ffa59762fed /addressbook | |
| parent | 3b32549c69267295a9a7b482e4a6ca2db9e6c73f (diff) | |
| parent | 8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff) | |
| download | gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.gz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.zst gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.zip | |
Merge branch 'master' into wip/gsettings
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; |