diff options
| -rw-r--r-- | mail/Makefile.am | 3 | ||||
| -rw-r--r-- | mail/component-factory.c | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am index eaefe9f32b..ff988594c0 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -65,8 +65,6 @@ evolution_mail_SOURCES = \ mail-mlist-magic.h \ mail-ops.c \ mail-ops.h \ - mail-summary.c \ - mail-summary.h \ mail-threads.c \ mail-threads.h \ mail-tools.c \ @@ -95,7 +93,6 @@ evolution_mail_LDADD = \ $(top_builddir)/e-util/ename/libename.la \ $(top_builddir)/libibex/libibex.la \ $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/executive-summary/evolution-services/libevolution-services.la \ $(BONOBO_VFS_GNOME_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(GTKHTML_LIBS) \ diff --git a/mail/component-factory.c b/mail/component-factory.c index 22a740854e..17d67c46de 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -42,8 +42,11 @@ #include "mail-local-storage.h" #include "component-factory.h" + +#ifdef WANT_THE_EXECUTIVE_SUMMARY #include <executive-summary/evolution-services/executive-summary-component.h> #include "mail-summary.h" +#endif CamelFolder *drafts_folder = NULL; CamelFolder *outbox_folder = NULL; @@ -179,6 +182,7 @@ factory_destroy (BonoboEmbeddable *embeddable, gtk_main_quit (); } +#ifdef WANT_THE_EXECUTIVE_SUMMARY static BonoboObject * summary_fn (BonoboGenericFactory *factory, void *closure) { @@ -188,6 +192,7 @@ summary_fn (BonoboGenericFactory *factory, void *closure) NULL, create_summary_view, NULL, NULL); return BONOBO_OBJECT (summary_component); } +#endif static BonoboObject * factory_fn (BonoboGenericFactory *factory, void *closure) @@ -216,11 +221,14 @@ factory_fn (BonoboGenericFactory *factory, void *closure) void component_factory_init (void) { - if (factory != NULL && summary_factory != NULL) + if (factory != NULL) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); +#ifdef WANT_THE_EXECUTIVE_SUMMARY summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#endif + storages_hash = g_hash_table_new (g_str_hash, g_str_equal); if (factory == NULL) { @@ -229,11 +237,12 @@ component_factory_init (void) exit (1); } +#ifdef WANT_THE_EXECUTIVE_SUMMARY if (summary_factory == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize Evolution's mail summary component.")); } - +#endif if (storages_hash == NULL) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Cannot initialize Evolution's mail storage hash.")); |