[evolution-patches] Patch for 46914

[JP Rosevear <jpr ximian com>]

-- 
JP Rosevear <jpr ximian com>
Ximian, Inc.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1435.2.4
diff -u -r1.1435.2.4 ChangeLog
--- ChangeLog	27 Jul 2003 22:44:13 -0000	1.1435.2.4
+++ ChangeLog	12 Aug 2003 17:04:14 -0000
@@ -1,3 +1,8 @@
+2003-08-12  JP Rosevear  <jpr ximian com>
+
+	* conduit/address-conduit.c (ecard_from_remote_record): duplicate
+	the extra address lines
+
 2003-07-23  Chris Toshok  <toshok ximian com>
 
 	* printing/e-contact-print.c (e_contact_print_response): deal with
Index: conduit/address-conduit.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/conduit/address-conduit.c,v
retrieving revision 1.75
diff -u -r1.75 address-conduit.c
--- conduit/address-conduit.c	7 Apr 2003 17:08:27 -0000	1.75
+++ conduit/address-conduit.c	12 Aug 2003 17:04:15 -0000
@@ -1150,7 +1150,7 @@
 		find++;
 	}
 	delivery->street = txt;
-	delivery->ext = find != NULL ? find : g_strdup ("");
+	delivery->ext = find != NULL ? g_strdup (find) : g_strdup ("");
 	delivery->city = get_entry_text (address, entryCity);
 	delivery->region = get_entry_text (address, entryState);
 	delivery->country = get_entry_text (address, entryCountry);