use the new e_destination_export_to_vcard_attribute call to build up the

2004-04-09  Chris Toshok  <toshok@ximian.com>

	* importers/evolution-ldif-importer.c (resolve_list_card): use the
	new e_destination_export_to_vcard_attribute call to build up the
	attributes.

	* importers/evolution-vcard-importer.c (process_item_fn): if we're
	importing a vcard that we wrote out previously containing xml in
	the EMAIL attributes, DTRT and strip it out and use
	e_destination_export_to_vcard_attribute to build up the proper
	attribute.

	* util/Makefile.am (libeabutil_la_SOURCES): remove
	eab-destination.[ch] and add e-destination.[ch].

	* printing/e-contact-print.c (e_contact_print_contact): we don't
	have to worry about the "<?xml..."  EMAIL fields anymore.

	* gui/widgets/eab-gui-util.c (eab_send_contact_list): just use the
	value as the address (since that's what it is) in the list case.

	* gui/widgets/eab-contact-display.c (render_contact_list): remove
	the EABDestination stuff from here.
	(eab_contact_display_render_compact): same.

	* gui/widgets/e-minicard.c (activiate_editor): fix warnings - use
	EAB_EDITOR instead of G_OBJECT.
	(add_field): we don't have to worry about the "<?xml..."  EMAIL
	fields anymore.
	(remodel): same.

	* gui/widgets/e-addressbook-treeview-adapter.c
	(adapter_get_value): we don't have to worry about the "<?xml..."
	EMAIL fields anymore.

	* gui/widgets/e-addressbook-table-adapter.c
	(addressbook_value_at): we don't have to worry about the
	"<?xml..." EMAIL fields anymore.

	* gui/contact-list-editor/e-contact-list-model.c
	(contact_list_value_at): eab->e.
	(contact_list_model_dispose): we're not a GtkObject, we're a
	GObject.  rename _destroy to _dispose, and chain up to the parent
	class's ::dispose.
	(e_contact_list_model_class_init): GtkObject -> GObject, and
	destroy -> dispose.
	(e_contact_list_model_init): GtkObject -> GObject, and EAB -> E.
	(e_contact_list_model_add_destination): EAB -> E.
	(e_contact_list_model_add_email): same.
	(e_contact_list_model_add_contact): same.
	(e_contact_list_model_get_destination): same.

	* gui/contact-list-editor/e-contact-list-editor.c
	(table_drag_data_received_cb): add email num arg to
	e_contact_list_model_add_contact.
	(extract_info): fill in the vcard attributes instead of just
	generating xml.
	(fill_in_info): extract the values from the vcard attributes.

	* gui/component/select-names/e-select-names-text-model.c
	(e_select_names_text_model_insert_length): eab->e, and don't
	sometimes copy, sometimes ::new.  always ::new.
	(e_select_names_text_model_delete): same.
	(e_select_names_text_model_obj_count): same.
	(nth_obj_index): same.

	* gui/component/select-names/e-select-names-table-model.c
	(fill_in_info): eab -> e.

	* gui/component/select-names/e-select-names-popup.c
	(make_contact_editor_cb): eab -> e.
	(change_email_num_cb): same.
	(toggle_html_mail_cb): same.
	(populate_popup_contact): same, and remove code that checks for
	<?xml, then imports the EDestination.
	(quick_add_cb): eab -> e.
	(populate_popup_nocontact): same.
	(e_select_names_populate_popup): same.

	* gui/component/select-names/e-select-names-model.h: eab -> e, and
	remove prototypes for nuked functions.

	* gui/component/select-names/e-select-names-model.c
	(destination_changed_proxy, send_changed, connect_destination,
	disconnect_destination): nuke.
	(e_select_names_model_duplicate): EAB -> E.
	(e_select_names_model_get_textification): same.
	(e_select_names_model_get_address_text): same.
	(e_select_names_model_get_destination): same.
	(e_select_names_model_export_destinationv): same.
	(send_changed): same.
	(e_select_names_model_import_destinationv): same.
	(e_select_names_model_get_contact): same.
	(e_select_names_model_contains): same.
	(e_select_names_model_insert): same, and remove call to
	connect_destination.
	(e_select_names_model_append): same.
	(e_select_names_model_replace): same, and remove call to
	disconnect/connect_destination.
	(e_select_names_model_delete): same.
	(delete_all_iter): nuke.
	(e_select_names_model_delete_all): use g_object_unref for the
	foreach call.
	(e_select_names_model_merge): EAB -> E.
	(e_select_names_model_name_pos): same.
	(e_select_names_model_name_pos): same.
	(e_select_names_model_load_all_contacts): nuke.
	(e_select_names_model_cancel_all_contact_load): nuke.

	* gui/component/select-names/e-select-names-manager.c
	(clean_cb, focus_in_cb, focus_out_cb, completion_popup_cb): nuke.
	(completion_handler): EAB -> E, and the signals are gone.

	* gui/component/select-names/e-select-names-completion.c: in
	general, s/eab_dest/e_dest and s/EABDest/EDest.
	(e_select_names_completion_got_book_view_cb): move the
	e_book_view_start to below the assignment of
	sequence_complete_received, just to put my mind at ease.
	(e_select_names_completion_stop_query): un-#if notyet the call to
	e_book_cancel.
	(e_select_names_completion_start_query): free the waiting_query
	before assigning to it.

	* gui/component/select-names/e-select-names-bonobo.c
	(entry_set_property_fn): remove calls to
	e_select_names_model_load_all_contacts, since that function is
	dead.

	* gui/component/addressbook-migrate.c (setup_progress_dialog):
	take the label to display to the user as an arg.
	(migrate_contact_lists_for_local_folders): loop over all contacts
	in all local addressbooks looking for ones that have <?xml in
	their EMAIL attributes.  for the ones we find, call
	e_destination_export_to_vcard_attribute to build up the proper
	attribute.
	(addressbook_migrate): add in a clause for all versions under
	1.5.7 to convert contact lists.  also, move the unrefs of the
	sources/groups to outside the if, as they're created outside it.

	* gui/component/Makefile.am (INCLUDES): remove the
	addressbook/backend/ dirs, since libebook isn't there anymore
	(nothing is, actually).  Add addressbook/util/.

svn path=/trunk/; revision=25390

5 files changed, 12 insertions, 71 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index aec91ae329..c3fadfdf23 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -5,7 +5,6 @@
 #include "e-addressbook-table-adapter.h"
 #include "eab-contact-merging.h"
 #include "eab-gui-util.h"
-#include "util/eab-destination.h"
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
@@ -92,16 +91,6 @@ addressbook_value_at (ETableModel *etc, int col, int row)
 
 	value = e_contact_get_const((EContact*)eab_model_contact_at (priv->model, row), col);
 
-	if (value && !strncmp (value, "<?xml", 5)) {
-		EABDestination *dest = eab_destination_import (value);
-		if (dest) {
-			/* XXX blech, we leak this */
-			value = g_strdup (eab_destination_get_textrep (dest, TRUE));
-			g_object_unref (dest);
-		}
-	}
-
-
 	return (void *)(value ? value : "");
 }
 
diff --git a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
index 592f9d2b03..2d0c4b8c93 100644
--- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c
@@ -379,15 +379,6 @@ adapter_get_value (GtkTreeModel *tree_model,
 
 	v = e_card_simple_get_const(simple, column);
 
-	if (v && !strncmp (v, "<?xml", 5)) {
-		EABDestination *dest = eab_destination_import (v);
-		if (dest) {
-			/* XXX blech, we leak this */
-			v = g_strdup (eab_destination_get_textrep (dest, TRUE));
-			g_object_unref (dest);
-		}
-	}
-
 	g_value_init (value, G_TYPE_STRING);
 	g_value_set_string (value, (v ? v : ""));
 }
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 36038eef48..fdaf1692ba 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -39,7 +39,7 @@
 #include "e-minicard-label.h"
 #include "e-minicard-view.h"
 #include "e-contact-editor.h"
-#include "util/eab-destination.h"
+#include "util/e-destination.h"
 
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *klass);
@@ -537,12 +537,12 @@ activiate_editor(GnomeCanvasItem *item)
 			if (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST)) {
 				EContactListEditor *editor = eab_show_contact_list_editor (book, e_minicard->contact,
 												FALSE, e_minicard->editable);
-				e_minicard->editor = G_OBJECT (editor);
+				e_minicard->editor = EAB_EDITOR (editor);
 			}
 			else {
 				EContactEditor *editor = eab_show_contact_editor (book, e_minicard->contact,
 												FALSE, e_minicard->editable);
-				e_minicard->editor = G_OBJECT (editor);
+				e_minicard->editor = EAB_EDITOR (editor);
 			}
 
 			g_object_ref (e_minicard->editor);
@@ -746,17 +746,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
 	name = g_strdup_printf("%s:", e_contact_pretty_name (field));
 	string = e_contact_get (e_minicard->contact, field);
 
-	/* Magically convert embedded XML into an address. */
-	if (!strncmp (string, "<?xml", 5)) {
-		EABDestination *dest = eab_destination_import (string);
-		if (dest != NULL) {
-			gchar *new_string = g_strdup (eab_destination_get_textrep (dest, TRUE));
-			g_free (string);
-			string = new_string;
-			g_object_unref (dest);
-		}
-	}
-
 	new_item = e_minicard_label_new(group);
 	gnome_canvas_item_set( new_item,
 			       "width", e_minicard->width - 4.0,
@@ -852,17 +841,6 @@ remodel( EMinicard *e_minicard )
 
 				string = e_contact_get(e_minicard->contact, field);
 				if (string && *string) {
-					/* Magically convert embedded XML into an address. */
-					if (!strncmp (string, "<?xml", 4)) {
-						EABDestination *dest = eab_destination_import (string);
-						if (dest != NULL) {
-							gchar *new_string = g_strdup (eab_destination_get_textrep (dest, TRUE));
-							g_free (string);
-							string = new_string;
-							g_object_unref (dest);
-						}
-					}
-
 					e_minicard->fields = g_list_append(e_minicard->fields, minicard_field);
 					g_object_set(minicard_field->label,
 						     "field", string,
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index d5e62d323a..a1dc832550 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -23,7 +23,6 @@
 #include "eab-contact-display.h"
 
 #include "e-util/e-html-utils.h"
-#include "util/eab-destination.h"
 
 #include <string.h>
 #include <libgnome/gnome-i18n.h>
@@ -243,14 +242,9 @@ render_contact_list (GtkHTMLStream *html_stream, EContact *contact)
 
 	email_list = e_contact_get (contact, E_CONTACT_EMAIL);
 	for (l = email_list; l; l = l->next) {
-		EABDestination *dest = eab_destination_import (l->data);
-		if (dest) {
-			const char *textrep = eab_destination_get_textrep (dest, TRUE);
-			char *html = e_text_to_html (textrep, E_TEXT_TO_HTML_CONVERT_ADDRESSES);
-			gtk_html_stream_printf (html_stream, "%s<br>", html);
-			g_free (html);
-			g_object_unref (dest);
-		}
+		char *html = e_text_to_html (l->data, E_TEXT_TO_HTML_CONVERT_ADDRESSES);
+		gtk_html_stream_printf (html_stream, "%s<br>", html);
+		g_free (html);
 	}
 	gtk_html_stream_printf (html_stream, "</td></tr></table>");
 }
@@ -499,14 +493,9 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
 
 			email_list = e_contact_get (contact, E_CONTACT_EMAIL);
 			for (l = email_list; l; l = l->next) {
-				EABDestination *dest = eab_destination_import (l->data);
-				if (dest) {
-					const char *textrep = eab_destination_get_textrep (dest, TRUE);
-					char *html = e_text_to_html (textrep, 0);
-					gtk_html_stream_printf (html_stream, "%s, ", html);
-					g_free (html);
-					g_object_unref (dest);
-				}
+				char *html = e_text_to_html (l->data, 0);
+				gtk_html_stream_printf (html_stream, "%s, ", html);
+				g_free (html);
 			}
 			gtk_html_stream_printf (html_stream, "</td></tr></table>");
 		}
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index f08e2122ce..3ad9ae7a9f 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -29,7 +29,7 @@
 #include <gal/util/e-util.h>
 #include "eab-gui-util.h"
 #include "util/eab-book-util.h"
-#include "util/eab-destination.h"
+#include "util/e-destination.h"
 #include "widgets/misc/e-image-chooser.h"
 #include "widgets/misc/e-source-selector.h"
 
@@ -703,14 +703,8 @@ eab_send_contact_list (GList *contacts, EABDisposition disposition)
 					addr = NULL;
 					if (iterator && iterator->data) {
 						if (is_list) {
-							/* We need to decode the list entries, which are XMLified EABDestinations. */
-							EABDestination *dest = eab_destination_import ((char*)iterator->data);
-							if (dest != NULL) {
-								name = g_strdup (eab_destination_get_name (dest));
-								addr = g_strdup (eab_destination_get_email (dest));
-								g_object_unref (dest);
-							}
-							
+							/* XXX we should probably try to get the name from the attribute parameter here.. */
+							addr = g_strdup ((char*)iterator->data);
 						} else { /* is just a plain old card */
 							EContactName *contact_name = e_contact_get (contact, E_CONTACT_NAME);
 							if (contact_name) {