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, 5 insertions, 27 deletions

diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 79dbe5493a..8d878cff14 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -26,8 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <libebook/e-book.h>
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
 
 G_BEGIN_DECLS
 
@@ -40,17 +38,6 @@ void                eab_search_result_dialog      (GtkWidget *parent,
 						   EBookViewStatus status);
 gint                eab_prompt_save_dialog        (GtkWindow   *parent);
 
-EContactEditor     *eab_show_contact_editor       (EBook       *book,
-						   EContact    *contact,
-						   gboolean     is_new_contact,
-						   gboolean     editable);
-EContactListEditor *eab_show_contact_list_editor  (EBook       *book,
-						   EContact    *contact,
-						   gboolean     is_new_contact,
-						   gboolean     editable);
-void                eab_show_multiple_contacts    (EBook       *book,
-						   GList       *list,
-						   gboolean     editable);
 void                eab_transfer_contacts         (EBook       *source,
 						   GList       *contacts, /* adopted */
 						   gboolean     delete_from_source,
@@ -64,26 +51,17 @@ void                eab_contact_list_save         (char *title,
 						   GList *list,
 						   GtkWindow *parent_window);
 
-typedef enum {
-	EAB_DISPOSITION_AS_ATTACHMENT,
-	EAB_DISPOSITION_AS_TO,
-} EABDisposition;
-
-void                eab_send_contact              (EContact       *contact,
-						   int             email_num,
-						   EABDisposition  disposition);
-void                eab_send_contact_list         (GList          *contacts,
-						   EABDisposition  disposition);
-
 GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
 
 
 ESource            *eab_select_source             (const gchar *title, const gchar *message,
 						   const gchar *select_uid, GtkWindow *parent);
 
-/* To parse quoted printable address & return email & name fields */						
-gboolean eab_parse_qp_email (const gchar *string, gchar **name, gchar **email);
-char *eab_parse_qp_email_to_html (const gchar *string);
+/* To parse quoted printable address & return email & name fields */
+gboolean	eab_parse_qp_email		(const gchar *string,
+						 gchar **name,
+						 gchar **email);
+gchar *		eab_parse_qp_email_to_html	(const gchar *string);
 
 G_END_DECLS