[ fixes bug #40403 ] revert the fix for 28945, as was done on the 1.2

2003-03-28  Chris Toshok  <toshok@ximian.com>

	[ fixes bug #40403 ]
	* backend/ebook/e-card.c (e_card_get_vobject): revert the fix for
	28945, as was done on the 1.2 branch.  this is because the "fix"
	actually breaks internal use of contact lists.  We need to make
	the exporting of contacts DTRT, instead of fixing it here.

svn path=/trunk/; revision=20568

1 files changed, 1 insertions, 10 deletions

diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 3a3f30e483..945888dad7 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -28,7 +28,6 @@
 #include "e-util/ename/e-name-western.h"
 #include "e-util/ename/e-address-western.h"
 #include "e-book.h"
-#include "e-destination.h"
 
 #define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
 #define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
@@ -578,15 +577,7 @@ e_card_get_vobject (const ECard *card, gboolean assumeUTF8)
 		EIterator *iterator = e_list_get_iterator(card->email);
 		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
 			VObject *emailprop;
-			char *e = (char *) e_iterator_get(iterator);
-			if (!strncmp (e, "<?xml", 5)) {
-				EDestination *dest = e_destination_import (e);
-				emailprop = ADD_PROP_VALUE(vobj, VCEmailAddressProp, e_destination_get_address (dest));
-				g_object_unref (dest);
-			}
-			else {
-				emailprop = ADD_PROP_VALUE(vobj, VCEmailAddressProp, e);
-			}
+			emailprop = ADD_PROP_VALUE(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
 			addProp (emailprop, VCInternetProp);
 		}
 		g_object_unref(iterator);