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

1 files changed, 25 insertions, 35 deletions

diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
index eb7c7c5e88..0ad6fda909 100644
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ b/addressbook/gui/component/select-names/e-select-names-popup.c
@@ -36,7 +36,6 @@
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkradiomenuitem.h>
 #include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <addressbook/util/eab-book-util.h>
@@ -52,13 +51,13 @@
 typedef struct _PopupInfo PopupInfo;
 struct _PopupInfo {
 	ESelectNamesTextModel *text_model;
-	EABDestination *dest;
+	EDestination *dest;
 	gint pos;
 	gint index;
 };
 
 static PopupInfo *
-popup_info_new (ESelectNamesTextModel *text_model, EABDestination *dest, gint pos, gint index)
+popup_info_new (ESelectNamesTextModel *text_model, EDestination *dest, gint pos, gint index)
 {
 	PopupInfo *info = g_new0 (PopupInfo, 1);
 	info->text_model = text_model;
@@ -105,10 +104,10 @@ static void
 make_contact_editor_cb (EBook *book, gpointer user_data)
 {
 	if (book) {
-		EABDestination *dest = EAB_DESTINATION (user_data);
+		EDestination *dest = E_DESTINATION (user_data);
 		EContact *contact;
 
-		contact = (EContact *) eab_destination_get_contact (dest);
+		contact = (EContact *) e_destination_get_contact (dest);
 		if (e_contact_get (contact, E_CONTACT_IS_LIST)) {
 			EContactListEditor *ce;
 			ce = e_addressbook_show_contact_list_editor (book, contact, FALSE, TRUE);
@@ -140,7 +139,7 @@ change_email_num_cb (GtkWidget *w, gpointer user_data)
 {
 	PopupInfo *info = (PopupInfo *) user_data;
 	gint n;
-	EABDestination *dest;
+	EDestination *dest;
 	
 	if (info == NULL) 
 		return;
@@ -150,9 +149,9 @@ change_email_num_cb (GtkWidget *w, gpointer user_data)
 
 	n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "number"));
 
-	if (n != eab_destination_get_email_num (info->dest)) {
-		dest = eab_destination_new ();
-		eab_destination_set_contact (dest, eab_destination_get_contact (info->dest), n);
+	if (n != e_destination_get_email_num (info->dest)) {
+		dest = e_destination_new ();
+		e_destination_set_contact (dest, e_destination_get_contact (info->dest), n);
 		e_select_names_model_replace (info->text_model->source, info->index, dest);
 	}
 }
@@ -177,7 +176,7 @@ toggle_html_mail_cb (GtkWidget *w, gpointer user_data)
 {
 	PopupInfo *info = (PopupInfo *) user_data;
 	GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM (w);
-	const EABDestination *dest;
+	const EDestination *dest;
 
 	if (info == NULL)
 		return;
@@ -185,7 +184,7 @@ toggle_html_mail_cb (GtkWidget *w, gpointer user_data)
 	dest = info->dest;
 
 	item = GTK_CHECK_MENU_ITEM (item);
-	eab_destination_set_html_mail_pref ((EABDestination *) dest, item->active);
+	e_destination_set_html_mail_pref ((EDestination *) dest, item->active);
 }
 #endif
 
@@ -197,7 +196,7 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info)
 	GtkWidget *menuitem;
 	GList *email_list;
 
-	contact = eab_destination_get_contact (info->dest);
+	contact = e_destination_get_contact (info->dest);
 
 #if TOO_MANY_MENU_ITEMS
 	menuitem = gtk_separator_menu_item_new();
@@ -227,7 +226,7 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info)
 
 	menuitem = gtk_check_menu_item_new_with_label (_("Send HTML Mail?"));
 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					eab_destination_get_html_mail_pref (info->dest));
+					e_destination_get_html_mail_pref (info->dest));
 	g_signal_connect (menuitem, "toggled",
 			  G_CALLBACK (toggle_html_mail_cb),
 			  info);
@@ -245,23 +244,14 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info)
 		if (g_list_length (email_list) > 1) {
 			GList *l;
 			GSList *radiogroup = NULL;
-			gint n = eab_destination_get_email_num (info->dest);
+			gint n = e_destination_get_email_num (info->dest);
 			gint j = g_list_length (email_list) - 1;
 
 			for (l = g_list_last (email_list); l; l = l->prev) {
 				char *email = l->data;
 				char *label = NULL;
 
-				if (!strncmp (email, "<?xml", 5)) {
-					EABDestination *dest = eab_destination_import (email);
-					if (dest) {
-						label = g_strdup (eab_destination_get_textrep (dest, TRUE));
-						g_object_unref (dest);
-					}
-				}
-				else {
-					label = g_strdup (email);
-				}
+				label = g_strdup (email);
 
 				if (list) {
 					menuitem = gtk_menu_item_new_with_label (label);
@@ -286,7 +276,7 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info)
 				g_free (label);
 			}
 		} else {
-			menuitem = gtk_menu_item_new_with_label (eab_destination_get_email (info->dest));
+			menuitem = gtk_menu_item_new_with_label (e_destination_get_email (info->dest));
 			gtk_widget_show (menuitem);
 			gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
 		}
@@ -303,7 +293,7 @@ populate_popup_contact (GtkWidget *pop, gboolean list, PopupInfo *info)
 					 ? EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME
 					 : EVOLUTION_IMAGESDIR "/" CONTACT_ICON_FILENAME);
 	gtk_widget_show (image);
-	menuitem = gtk_image_menu_item_new_with_label (eab_destination_get_name (info->dest));
+	menuitem = gtk_image_menu_item_new_with_label (e_destination_get_name (info->dest));
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
 				       image);
 	gtk_widget_show (menuitem);
@@ -314,7 +304,7 @@ static void
 quick_add_cb (GtkWidget *w, gpointer user_data)
 {
 	PopupInfo *info = (PopupInfo *) user_data;
-	e_contact_quick_add_free_form (eab_destination_get_address (info->dest), NULL, NULL);
+	e_contact_quick_add_free_form (e_destination_get_address (info->dest), NULL, NULL);
 }
 
 static void
@@ -337,7 +327,7 @@ populate_popup_nocontact (GtkWidget *pop, PopupInfo *info)
 #if TOO_MANY_MENU_ITEMS
 	menuitem = gtk_check_menu_item_new_with_label (_("Send HTML Mail?"));
 	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
-					eab_destination_get_html_mail_pref (info->dest));
+					e_destination_get_html_mail_pref (info->dest));
 	g_signal_connect (menuitem, "toggled",
 			  G_CALLBACK (toggle_html_mail_cb),
 			  info);
@@ -349,9 +339,9 @@ populate_popup_nocontact (GtkWidget *pop, PopupInfo *info)
 	gtk_widget_show (menuitem);
 	gtk_menu_shell_prepend (GTK_MENU_SHELL (pop), menuitem);
 
-	str = eab_destination_get_name (info->dest);
+	str = e_destination_get_name (info->dest);
 	if (! (str && *str))
-		str = eab_destination_get_email (info->dest);
+		str = e_destination_get_email (info->dest);
 	if (! (str && *str))
 		str = _("Unnamed Contact");
 
@@ -366,7 +356,7 @@ e_select_names_populate_popup (GtkWidget *menu, ESelectNamesTextModel *text_mode
 {
 	ESelectNamesModel *model;
 	PopupInfo *info;
-	EABDestination *dest;
+	EDestination *dest;
 	gint index;
 
 	g_return_if_fail (GTK_IS_MENU_SHELL (menu));
@@ -381,14 +371,14 @@ e_select_names_populate_popup (GtkWidget *menu, ESelectNamesTextModel *text_mode
 		return;
 
 	/* XXX yuck, why does this return a const? */
-	dest = (EABDestination *)e_select_names_model_get_destination (model, index);
-	if (eab_destination_is_empty (dest))
+	dest = (EDestination *)e_select_names_model_get_destination (model, index);
+	if (e_destination_empty (dest))
 		return;
 
 	info = popup_info_new (text_model, dest, pos, index);
 	
-	if (eab_destination_get_contact (dest)) {
-		populate_popup_contact (menu, eab_destination_is_evolution_list (dest), info);
+	if (e_destination_get_contact (dest)) {
+		populate_popup_contact (menu, e_destination_is_evolution_list (dest), info);
 	} else {
 		populate_popup_nocontact (menu, info);
 	}