diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 7 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 10 | ||||
| -rw-r--r-- | calendar/gui/component-factory.c | 10 |
4 files changed, 16 insertions, 21 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2f0b1e412e..15bf30af5a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2001-06-08 Iain Holmes <iain@ximian.com> + + * gui/component-factory.c: Removed the executive-summary includes. + (component_factory_init): Don't init the summary factory. + + * gui/calendar-summary.[ch]: Removed. + + * gui/Makefile.am: Remove executive-summary stuff, move some libs + around a bit. + 2001-06-04 JP Rosevear <jpr@ximian.com> * gui/dialogs/recurrence-page.c (recurrence_page_set_dates): diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 5d48feff95..59850d48f5 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -30,7 +30,6 @@ INCLUDES = \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/executive-summary \ -I$(includedir) \ $(BONOBO_HTML_GNOME_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ @@ -54,8 +53,6 @@ evolution_calendar_SOURCES = \ calendar-commands.h \ calendar-model.c \ calendar-model.h \ - calendar-summary.c \ - calendar-summary.h \ comp-util.c \ comp-util.h \ control-factory.c \ @@ -112,8 +109,8 @@ evolution_calendar_SOURCES = \ evolution_calendar_LDADD = \ alarm-notify/libalarm.a \ - $(top_builddir)/executive-summary/evolution-services/libevolution-services.la \ $(DB3_LDADD) \ + $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ @@ -122,7 +119,7 @@ evolution_calendar_LDADD = \ $(top_builddir)/libical/src/libical/libical.la \ $(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/widgets/menus/libmenus.la \ + $(EXTRA_GNOME_LIBS) \ dialogs/libcal-dialogs.a \ $(BONOBO_HTML_GNOME_LIBS) \ $(GNOME_VFS_LIBS) \ diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 8dae53c707..da68cabf05 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -29,13 +29,12 @@ #include <libgnomevfs/gnome-vfs-uri.h> #include <libgnomevfs/gnome-vfs-ops.h> +#include <bonobo/bonobo-generic-factory.h> #include "evolution-shell-component.h" -#include <executive-summary/evolution-services/executive-summary-component.h> #include "component-factory.h" #include "tasks-control-factory.h" #include "control-factory.h" #include "calendar-config.h" -#include "calendar-summary.h" #include "tasks-control.h" #include "tasks-migrate.h" @@ -44,7 +43,6 @@ #define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" static BonoboGenericFactory *factory = NULL; -static BonoboGenericFactory *summary_factory = NULL; char *evolution_dir; static const EvolutionShellComponentFolderType folder_types[] = { @@ -332,16 +330,12 @@ factory_fn (BonoboGenericFactory *factory, void component_factory_init (void) { - if (factory != NULL && factory != NULL) + if (factory != NULL) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - summary_factory = calendar_summary_factory_init (); - if (factory == NULL) g_error ("Cannot initialize Evolution's calendar component."); - if (summary_factory == NULL) - g_error ("Cannot initialize Evolution's calendar summary component."); } diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index 8dae53c707..da68cabf05 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -29,13 +29,12 @@ #include <libgnomevfs/gnome-vfs-uri.h> #include <libgnomevfs/gnome-vfs-ops.h> +#include <bonobo/bonobo-generic-factory.h> #include "evolution-shell-component.h" -#include <executive-summary/evolution-services/executive-summary-component.h> #include "component-factory.h" #include "tasks-control-factory.h" #include "control-factory.h" #include "calendar-config.h" -#include "calendar-summary.h" #include "tasks-control.h" #include "tasks-migrate.h" @@ -44,7 +43,6 @@ #define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" static BonoboGenericFactory *factory = NULL; -static BonoboGenericFactory *summary_factory = NULL; char *evolution_dir; static const EvolutionShellComponentFolderType folder_types[] = { @@ -332,16 +330,12 @@ factory_fn (BonoboGenericFactory *factory, void component_factory_init (void) { - if (factory != NULL && factory != NULL) + if (factory != NULL) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - summary_factory = calendar_summary_factory_init (); - if (factory == NULL) g_error ("Cannot initialize Evolution's calendar component."); - if (summary_factory == NULL) - g_error ("Cannot initialize Evolution's calendar summary component."); } |