Re: evolution address book conduit issues

[JP Rosevear <jpr ximian com>]

On Tue, 2003-08-12 at 12:36, Charlie Wood wrote:
> On Tue, 2003-08-12 at 17:00, JP Rosevear wrote:
> > Yes.  I have tracked one problem with the addressbook conduit to memory
> > corruption in evolution itself.  I don't have a backtrace for the crash
> > during the partial sync that people have been describing so i'm not sure
> > if this is it or not.  If someone could provide that it would be great.
> 
> As it happens, I was tinkering with this afternoon. This is on an RH8
> system, the version details are a few messages back on the list if
> required:

Great.  Patch is attached for the evolution conduit.  Should ship with
evolution 1.4.5.

-JP
-- 
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);