From 5a1c48696363e3f3c7ffe11bdffdcad6557f811a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 20 Jan 2009 04:33:23 +0000 Subject: Untangle some circular dependencies with the composer. Addressbook and calendar no longer depend on the mailer. svn path=/branches/kill-bonobo/; revision=37107 --- addressbook/gui/component/Makefile.am | 4 ---- addressbook/gui/component/eab-composer-util.c | 3 --- 2 files changed, 7 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index c245592bea..ad603bf9b4 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -1,7 +1,3 @@ -if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la -endif - INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -I$(top_srcdir) \ diff --git a/addressbook/gui/component/eab-composer-util.c b/addressbook/gui/component/eab-composer-util.c index aa994df216..c69375a0b9 100644 --- a/addressbook/gui/component/eab-composer-util.c +++ b/addressbook/gui/component/eab-composer-util.c @@ -23,7 +23,6 @@ #include #include -#include "mail/em-composer-utils.h" #include "composer/e-msg-composer.h" #include "addressbook/util/eab-book-util.h" #include "addressbook/gui/widgets/eab-gui-util.h" @@ -46,7 +45,6 @@ eab_send_as_to (GList *destinations) 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 (); @@ -124,7 +122,6 @@ eab_send_as_attachment (GList *destinations) 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 (); -- cgit v1.2.3