Rearranged some of the addressbook code to try and eliminate some circular

dependencies in our libraries.  The circular dependency between the composer
and the mail module is still causing me headaches.  And it doesn't help that
the addressbook and calendar also want to link to the composer.

svn path=/branches/kill-bonobo/; revision=36782

1 files changed, 1 insertions, 366 deletions

diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 3ba848ecc8..d3c0910827 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -40,16 +40,11 @@
 #include "misc/e-image-chooser.h"
 #include <e-util/e-icon-factory.h>
 #include "eab-contact-merging.h"
-#include <composer/e-msg-composer.h>
-#include <mail/em-composer-utils.h>
 
 /* we link to camel for decoding quoted printable email addresses */
 #include <camel/camel-mime-utils.h>
 
-#include "addressbook/gui/contact-editor/eab-editor.h"
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-#include "addressbook/gui/component/addressbook.h"
+#include "addressbook/util/addressbook.h"
 
 /* the NULL's in this table correspond to the status codes
    that should *never* be generated by a backend */
@@ -201,140 +196,6 @@ eab_prompt_save_dialog (GtkWindow *parent)
 	return e_error_run (parent, "addressbook:prompt-save", NULL);
 }
 
-static void
-added_cb (EBook* book, EBookStatus status, EContact *contact,
-	  gpointer data)
-{
-	gboolean is_list = GPOINTER_TO_INT (data);
-
-	if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
-		eab_error_dialog (is_list ? _("Error adding list") : _("Error adding contact"), status);
-	}
-}
-
-static void
-modified_cb (EBook* book, EBookStatus status, EContact *contact,
-	     gpointer data)
-{
-	gboolean is_list = GPOINTER_TO_INT (data);
-
-	if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
-		eab_error_dialog (is_list ? _("Error modifying list") : _("Error modifying contact"),
-				  status);
-	}
-}
-
-static void
-deleted_cb (EBook* book, EBookStatus status, EContact *contact,
-	    gpointer data)
-{
-	gboolean is_list = GPOINTER_TO_INT (data);
-
-	if (status != E_BOOK_ERROR_OK) {
-		eab_error_dialog (is_list ? _("Error removing list") : _("Error removing contact"),
-				  status);
-	}
-}
-
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	g_object_unref (editor);
-}
-
-EContactEditor *
-eab_show_contact_editor (EBook *book, EContact *contact,
-			 gboolean is_new_contact,
-			 gboolean editable)
-{
-	EContactEditor *ce;
-
-	ce = e_contact_editor_new (book, contact, is_new_contact, editable);
-
-	g_signal_connect (ce, "contact_added",
-			  G_CALLBACK (added_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "contact_modified",
-			  G_CALLBACK (modified_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "contact_deleted",
-			  G_CALLBACK (deleted_cb), GINT_TO_POINTER (FALSE));
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), NULL);
-
-	return ce;
-}
-
-EContactListEditor *
-eab_show_contact_list_editor (EBook *book, EContact *contact,
-			      gboolean is_new_contact,
-			      gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = e_contact_list_editor_new (book, contact, is_new_contact, editable);
-
-	g_signal_connect (ce, "contact_added",
-			  G_CALLBACK (added_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "contact_modified",
-			  G_CALLBACK (modified_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "contact_deleted",
-			  G_CALLBACK (deleted_cb), GINT_TO_POINTER (TRUE));
-	g_signal_connect (ce, "editor_closed",
-			  G_CALLBACK (editor_closed_cb), GINT_TO_POINTER (TRUE));
-
-	eab_editor_show (EAB_EDITOR (ce));
-
-	return ce;
-}
-
-static void
-view_contacts (EBook *book, GList *list, gboolean editable)
-{
-	for (; list; list = list->next) {
-		EContact *contact = list->data;
-		if (e_contact_get (contact, E_CONTACT_IS_LIST))
-			eab_show_contact_list_editor (book, contact, FALSE, editable);
-		else
-			eab_show_contact_editor (book, contact, FALSE, editable);
-	}
-}
-
-void
-eab_show_multiple_contacts (EBook *book,
-			    GList *list,
-			    gboolean editable)
-{
-	if (list) {
-		int length = g_list_length (list);
-		if (length > 5) {
-			GtkWidget *dialog;
-			gint response;
-
-			dialog = gtk_message_dialog_new (NULL,
-							 0,
-							 GTK_MESSAGE_QUESTION,
-							 GTK_BUTTONS_NONE,
-							 ngettext("Opening %d contact will open %d new window as well.\n"
-								  "Do you really want to display this contact?",
-								  "Opening %d contacts will open %d new windows as well.\n"
-								  "Do you really want to display all of these contacts?",
-								  length),
-							 length,
-							 length);
-			gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-						_("_Don't Display"), GTK_RESPONSE_NO,
-						_("Display _All Contacts"), GTK_RESPONSE_YES,
-						NULL);
-			response = gtk_dialog_run (GTK_DIALOG (dialog));
-			gtk_widget_destroy (dialog);
-			if (response == GTK_RESPONSE_YES)
-				view_contacts (book, list, editable);
-		} else {
-			view_contacts (book, list, editable);
-		}
-	}
-}
-
-
 static gint
 file_exists(GtkWindow *window, const char *filename)
 {
@@ -773,232 +634,6 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de
 	addressbook_load (dest, got_book_cb, process);
 }
 
-typedef struct {
-	EContact *contact;
-	int email_num; /* if the contact is a person (not a list), the email address to use */
-} ContactAndEmailNum;
-
-static void
-eab_send_to_contact_and_email_num_list (GList *contact_list)
-{
-	EMsgComposer *composer;
-	EComposerHeaderTable *table;
-	GPtrArray *to_array;
-	GPtrArray *bcc_array;
-
-	union {
-		gpointer *pdata;
-		EDestination **destinations;
-	} convert;
-
-	if (contact_list == NULL)
-		return;
-
-	composer = e_msg_composer_new ();
-	table = e_msg_composer_get_header_table (composer);
-	em_composer_utils_setup_default_callbacks (composer);
-
-	to_array = g_ptr_array_new ();
-	bcc_array = g_ptr_array_new ();
-
-	/* Sort contacts into "To" and "Bcc" destinations. */
-	while (contact_list != NULL) {
-		ContactAndEmailNum *ce = contact_list->data;
-		EContact *contact = ce->contact;
-		EDestination *destination;
-
-		destination = e_destination_new ();
-		e_destination_set_contact (destination, contact, 0);
-
-		if (e_destination_is_evolution_list (destination)) {
-			if (e_destination_list_show_addresses (destination))
-				g_ptr_array_add (to_array, destination);
-			else
-				g_ptr_array_add (bcc_array, destination);
-		} else
-			g_ptr_array_add (to_array, destination);
-
-		contact_list = g_list_next (contact_list);
-	}
-
-	/* Add sentinels to each array. */
-	g_ptr_array_add (to_array, NULL);
-	g_ptr_array_add (bcc_array, NULL);
-
-	/* XXX Acrobatics like this make me question whether NULL-terminated
-	 *     arrays are really the best argument type for passing a list of
-	 *     destinations to the header table. */
-
-	/* Add "To" destinations. */
-	convert.pdata = to_array->pdata;
-	e_composer_header_table_set_destinations_to (
-		table, convert.destinations);
-	g_ptr_array_free (to_array, FALSE);
-	e_destination_freev (convert.destinations);
-
-	/* Add "Bcc" destinations. */
-	convert.pdata = bcc_array->pdata;
-	e_composer_header_table_set_destinations_bcc (
-		table, convert.destinations);
-	g_ptr_array_free (bcc_array, FALSE);
-	e_destination_freev (convert.destinations);
-
-	gtk_widget_show (GTK_WIDGET (composer));
-}
-
-static const char *
-get_email (EContact *contact, EContactField field_id, gchar **to_free)
-{
-	char *name = NULL, *mail = NULL;
-	const char *value = e_contact_get_const (contact, field_id);
-
-	*to_free = NULL;
-
-	if (eab_parse_qp_email (value, &name, &mail)) {
-		*to_free = g_strdup_printf ("%s <%s>", name, mail);
-		value = *to_free;
-	}
-
-	g_free (name);
-	g_free (mail);
-
-	return value;
-}
-
-static void
-eab_send_contact_list_as_attachment (GList *contacts)
-{
-	EMsgComposer *composer;
-	EComposerHeaderTable *table;
-	CamelMimePart *attachment;
-	gchar *data;
-
-	if (contacts == NULL)
-		return;
-
-	composer = e_msg_composer_new ();
-	table = e_msg_composer_get_header_table (composer);
-	em_composer_utils_setup_default_callbacks (composer);
-
-	attachment = camel_mime_part_new ();
-	data = eab_contact_list_to_string (contacts);
-
-	camel_mime_part_set_content (
-		attachment, data, strlen (data), "text/x-vcard");
-
-	if (contacts->next != NULL)
-		camel_mime_part_set_description (
-			attachment, _("Multiple vCards"));
-	else {
-		EContact *contact = contacts->data;
-		const gchar *file_as;
-		gchar *description;
-
-		file_as = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		description = g_strdup_printf (_("vCard for %s"), file_as);
-		camel_mime_part_set_description (attachment, description);
-		g_free (description);
-	}
-
-	camel_mime_part_set_disposition (attachment, "attachment");
-
-	e_msg_composer_attach (composer, attachment);
-	camel_object_unref (attachment);
-
-	if (contacts->next != NULL)
-		e_composer_header_table_set_subject (
-			table, _("Contact information"));
-	else {
-		EContact *contact = contacts->data;
-		gchar *tempstr;
-		const gchar *tempstr2;
-		gchar *tempfree = NULL;
-
-		tempstr2 = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-		if (!tempstr2 || !*tempstr2)
-			tempstr2 = e_contact_get_const (contact, E_CONTACT_ORG);
-		if (!tempstr2 || !*tempstr2) {
-			g_free (tempfree);
-			tempstr2 = get_email (contact, E_CONTACT_EMAIL_1, &tempfree);
-		}
-		if (!tempstr2 || !*tempstr2) {
-			g_free (tempfree);
-			tempstr2 = get_email (contact, E_CONTACT_EMAIL_2, &tempfree);
-		}
-		if (!tempstr2 || !*tempstr2) {
-			g_free (tempfree);
-			tempstr2 = get_email (contact, E_CONTACT_EMAIL_3, &tempfree);
-		}
-
-		if (!tempstr2 || !*tempstr2)
-			tempstr = g_strdup_printf (_("Contact information"));
-		else
-			tempstr = g_strdup_printf (_("Contact information for %s"), tempstr2);
-
-		e_composer_header_table_set_subject (table, tempstr);
-
-		g_free (tempstr);
-		g_free (tempfree);
-	}
-
-	gtk_widget_show (GTK_WIDGET (composer));
-}
-
-void
-eab_send_contact_list (GList *contacts, EABDisposition disposition)
-{
-	switch (disposition) {
-	case EAB_DISPOSITION_AS_TO: {
-		GList *list = NULL, *l;
-
-		for (l = contacts; l; l = l->next) {
-			ContactAndEmailNum *ce = g_new (ContactAndEmailNum, 1);
-			ce->contact = l->data;
-			ce->email_num = 0; /* hardcode this */
-
-			list = g_list_append (list, ce);
-		}
-
-		eab_send_to_contact_and_email_num_list (list);
-
-		g_list_foreach (list, (GFunc)g_free, NULL);
-		g_list_free (list);
-		break;
-	}
-	case EAB_DISPOSITION_AS_ATTACHMENT:
-		eab_send_contact_list_as_attachment (contacts);
-		break;
-	}
-}
-
-void
-eab_send_contact (EContact *contact, int email_num, EABDisposition disposition)
-{
-	GList *list = NULL;
-
-	switch (disposition) {
-	case EAB_DISPOSITION_AS_TO: {
-		ContactAndEmailNum ce;
-
-		ce.contact = contact;
-		ce.email_num = email_num;
-
-		list = g_list_prepend (NULL, &ce);
-		eab_send_to_contact_and_email_num_list (list);
-		break;
-	}
-	case EAB_DISPOSITION_AS_ATTACHMENT: {
-		list = g_list_prepend (NULL, contact);
-		eab_send_contact_list_as_attachment (list);
-		break;
-	}
-	}
-
-	g_list_free (list);
-}
-
 GtkWidget *
 eab_create_image_chooser_widget(gchar *name,
 				gchar *string1, gchar *string2,