[evolution/gnome-3-2] Bug #661409 - Contact display drops address lines

[Dan VrÃtil <dvratil src gnome org>]

commit afb4c429a11a2a73c579f5fe68cb5f9c885c783c
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Oct 20 11:32:52 2011 +0200

    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.

 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 c951b29..fefb937 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;