diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 16 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor-util.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/e-delegate-dialog.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-model.c | 12 |
6 files changed, 28 insertions, 12 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a1a505e0c6..f42e1d9552 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,19 @@ +2002-07-08 Peter Williams <peterw@ximian.com> + + * gui/Makefile.am (INCLUDES): Change the -I flags to get + it to play nicely with the new Ebook header paradigm. + + * gui/dialogs/Makefile.am: Same. + + * gui/e-meeting-model.c: More of the same. + + * gui/dialogs/e-delegate-dialog.c: + * gui/dialogs/e-meeting-model.c: + * gui/dialogs/comp-editor-util.c: Fix include lines to get + ebook headers. + + * pcs/Makefile.am: Same. + 2002-07-02 Rodrigo Moya <rodrigo@ximian.com> Fixes #16034 diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 9c842635f7..28d8e02aeb 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -45,8 +45,8 @@ INCLUDES = \ -I$(top_builddir)/calendar/cal-client \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ - -I$(top_srcdir)/addressbook/backend/ebook \ - -I$(top_builddir)/addressbook/backend/ebook \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/widgets \ -I$(includedir) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index aa107d84e0..5108fc8b2c 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -22,8 +22,8 @@ INCLUDES = \ -I$(top_builddir)/libical/src/libical \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ - -I$(top_srcdir)/addressbook/backend/ebook \ - -I$(top_builddir)/addressbook/backend/ebook \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ -I$(includedir) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 34d4e71e81..5d414a640c 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -32,7 +32,7 @@ #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-widget.h> #include <gal/unicode/gunicode.h> -#include <e-destination.h> +#include <ebook/e-destination.h> #include <e-util/e-time-utils.h> #include <cal-util/timeutil.h> #include "../calendar-config.h" diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 159d27e6a3..d37fbce51c 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -32,7 +32,7 @@ #include <ical.h> #include <glade/glade.h> #include <widgets/misc/e-map.h> -#include <e-destination.h> +#include <ebook/e-destination.h> #include "Evolution-Addressbook-SelectNames.h" #include "e-delegate-dialog.h" diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 7f1479f452..50a0e4f49a 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -38,12 +38,12 @@ #include <gal/e-table/e-cell-popup.h> #include <gal/e-table/e-cell-combo.h> #include <gal/util/e-unicode-i18n.h> -#include <e-book.h> -#include <e-card-types.h> -#include <e-card-cursor.h> -#include <e-card.h> -#include <e-card-simple.h> -#include <e-destination.h> +#include <ebook/e-book.h> +#include <ebook/e-card-types.h> +#include <ebook/e-card-cursor.h> +#include <ebook/e-card.h> +#include <ebook/e-card-simple.h> +#include <ebook/e-destination.h> #include <cal-util/cal-component.h> #include <cal-util/cal-util.h> #include <cal-util/timeutil.h> |