diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 5 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 10 | ||||
| -rw-r--r-- | calendar/gui/calendar-summary.c | 4 | ||||
| -rw-r--r-- | calendar/gui/component-factory.c | 10 |
5 files changed, 25 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 954bcea954..020e228ca8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,7 @@ +2000-10-12 Iain Holmes <iain@helixcode.com> + + * gui/component-factory.c: Disable the executive summary. + 2000-10-11 JP Rosevear <jpr@helixcode.com> * pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 191273eded..de1f72b2c6 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -33,8 +33,7 @@ LINK_FLAGS = \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.la \ - $(top_builddir)/libical/src/libical/libical.a \ - $(top_builddir)/executive-summary/evolution-services/libevolution-services.la + $(top_builddir)/libical/src/libical/libical.a gladedir = $(datadir)/evolution/glade @@ -54,8 +53,6 @@ evolution_calendar_SOURCES = \ calendar-commands.h \ calendar-model.c \ calendar-model.h \ - calendar-summary.c \ - calendar-summary.h \ control-factory.c \ control-factory.h \ component-factory.c \ diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index d45db48584..e5fb4c65a0 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -24,7 +24,9 @@ #include <config.h> #include <bonobo.h> #include "evolution-shell-component.h" +#ifdef WANT_THE_EXECUTIVE_SUMMARY #include <executive-summary/evolution-services/executive-summary-component.h> +#endif #include "component-factory.h" #include "control-factory.h" #include "calendar-config.h" @@ -108,6 +110,7 @@ factory_fn (BonoboGenericFactory *factory, return BONOBO_OBJECT (shell_component); } +#ifdef WANT_THE_EXECUTIVE_SUMMARY static BonoboObject * summary_fn (BonoboGenericFactory *factory, void *closure) @@ -120,6 +123,7 @@ summary_fn (BonoboGenericFactory *factory, evolution_dir); return BONOBO_OBJECT (summary_component); } +#endif void @@ -129,11 +133,15 @@ component_factory_init (void) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#ifdef WANT_THE_EXECUTIVE_SUMMARY + summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#endif if (factory == NULL) g_error ("Cannot initialize Evolution's calendar component."); +#ifdef WANT_THE_EXECUTIVE_SUMMARY if (summary_factory == NULL) g_error ("Cannot initialize Evolution's calendar summary component."); +#endif } diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c index 9ce8c70dbb..0c05ace30a 100644 --- a/calendar/gui/calendar-summary.c +++ b/calendar/gui/calendar-summary.c @@ -93,7 +93,7 @@ cal_loaded (CalClient *client, g_free (html); } else { g_print ("Error loading %d\n", status); - executive_summary_component_update (summary->component, ""); + executive_summary_component_update (summary->component, " "); } } @@ -131,5 +131,5 @@ create_summary_view (ExecutiveSummaryComponent *component, gtk_signal_connect (GTK_OBJECT (summary->client), "cal_loaded", GTK_SIGNAL_FUNC (cal_loaded), summary); - return g_strdup (""); + return g_strdup (" "); } diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index d45db48584..e5fb4c65a0 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -24,7 +24,9 @@ #include <config.h> #include <bonobo.h> #include "evolution-shell-component.h" +#ifdef WANT_THE_EXECUTIVE_SUMMARY #include <executive-summary/evolution-services/executive-summary-component.h> +#endif #include "component-factory.h" #include "control-factory.h" #include "calendar-config.h" @@ -108,6 +110,7 @@ factory_fn (BonoboGenericFactory *factory, return BONOBO_OBJECT (shell_component); } +#ifdef WANT_THE_EXECUTIVE_SUMMARY static BonoboObject * summary_fn (BonoboGenericFactory *factory, void *closure) @@ -120,6 +123,7 @@ summary_fn (BonoboGenericFactory *factory, evolution_dir); return BONOBO_OBJECT (summary_component); } +#endif void @@ -129,11 +133,15 @@ component_factory_init (void) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#ifdef WANT_THE_EXECUTIVE_SUMMARY + summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL); +#endif if (factory == NULL) g_error ("Cannot initialize Evolution's calendar component."); +#ifdef WANT_THE_EXECUTIVE_SUMMARY if (summary_factory == NULL) g_error ("Cannot initialize Evolution's calendar summary component."); +#endif } |