Get composer integration working with the rest of the modules, but man do

we have circular dependencies all over the place!  Big house of cards.

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

4 files changed, 10 insertions, 18 deletions

diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b6ce23fa91..a0d15b0061 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -177,6 +177,7 @@ libcal_gui_la_SOURCES =		\
 
 libcal_gui_la_LIBADD =					\
 	$(WIN32_BOOTSTRAP_LIBS)						\
+	$(top_builddir)/composer/libcomposer.la				\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index f320ccc42b..ad0abaa0e0 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -910,6 +910,7 @@ create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
 static void
 edit_component (ECal *client, ECalComponent *comp)
 {
+#if 0  /* KILL-BONOBO */
 	const char *uid;
 	const char *uri;
 	ECalSourceType source_type;
@@ -953,6 +954,7 @@ edit_component (ECal *client, ECalComponent *comp)
 
 	/* Get rid of the factory */
 	bonobo_object_release_unref (factory, NULL);
+#endif
 }
 
 typedef struct {
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index eb407a8117..5a954b5ff9 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1098,7 +1098,6 @@ append_cal_attachments (EMsgComposer *composer,
                         ECalComponent *comp,
                         GSList *attach_list)
 {
-#if 0 /* KILL-BONOBO */
 	struct CalMimeAttach *mime_attach;
 	GSList *l;
 
@@ -1131,14 +1130,12 @@ append_cal_attachments (EMsgComposer *composer,
 		g_free (mime_attach->description);
 		g_free (mime_attach->encoded_data);
 	}
-#endif
 }
 
 gboolean
 itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 		ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users)
 {
-#if 0  /* KILL-BONOBO */
 	EMsgComposer *composer;
 	EComposerHeaderTable *table;
 	EDestination **destinations;
@@ -1186,11 +1183,9 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 	table = e_msg_composer_get_header_table (composer);
 	em_composer_utils_setup_default_callbacks (composer);
 
-#if 0  /* KILL-BONOBO */
 	e_composer_header_table_set_subject (table, subject);
 	e_composer_header_table_set_account_name (table, from);
 	e_composer_header_table_set_destinations_to (table, destinations);
-#endif
 
 	e_destination_freev (destinations);
 
@@ -1212,7 +1207,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 		description = comp_description (comp);
 
 		body = camel_text_to_html (
-			body, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
+			description, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
 		e_msg_composer_set_body_text (composer, body, -1);
 		g_free (body);
 
@@ -1257,9 +1252,6 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
 	g_free (ical_string);
 
 	return retval;
-#endif
-
-	return FALSE;
 }
 
 gboolean
@@ -1270,7 +1262,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
                         icalcomponent *zones,
                         GSList *attachments_list)
 {
-#if 0  /* KILL-BONOBO */
 	EMsgComposer *composer;
 	EComposerHeaderTable *table;
 	EDestination **destinations;
@@ -1300,11 +1291,9 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	table = e_msg_composer_get_header_table (composer);
 	em_composer_utils_setup_default_callbacks (composer);
 
-#if 0  /* KILL-BONOBO */
 	e_composer_header_table_set_subject (table, subject);
 	e_composer_header_table_set_account_name (table, from);
 	e_composer_header_table_set_destinations_to (table, destinations);
-#endif
 
 	e_destination_freev (destinations);
 
@@ -1427,9 +1416,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 	g_free (subject);
 	g_free (ical_string);
 	return retval;
-#endif
-
-	return FALSE;
 }
 
 gboolean
diff --git a/calendar/modules/Makefile.am b/calendar/modules/Makefile.am
index 8a3cb16322..059d99fea1 100644
--- a/calendar/modules/Makefile.am
+++ b/calendar/modules/Makefile.am
@@ -67,14 +67,17 @@ libevolution_module_tasks_la_SOURCES =			\
 libevolution_module_calendars_la_LIBADD =		\
 	$(WIN32_BOOTSTRAP_LIBS)				\
 	$(top_builddir)/shell/libeshell.la		\
-	$(top_builddir)/calendar/gui/libcal-gui.la
+	$(top_builddir)/calendar/gui/libcal-gui.la	\
+	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
 
 libevolution_module_memos_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)				\
 	$(top_builddir)/shell/libeshell.la		\
-	$(top_builddir)/calendar/gui/libcal-gui.la
+	$(top_builddir)/calendar/gui/libcal-gui.la	\
+	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
 
 libevolution_module_tasks_la_LIBADD =			\
 	$(WIN32_BOOTSTRAP_LIBS)				\
 	$(top_builddir)/shell/libeshell.la		\
-	$(top_builddir)/calendar/gui/libcal-gui.la
+	$(top_builddir)/calendar/gui/libcal-gui.la	\
+	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la