aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/dialogs/Makefile.am1
-rw-r--r--calendar/gui/tasks-component.h2
4 files changed, 13 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 257e866430..e404f89c47 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-03 Dan Winship <danw@ximian.com>
+
+ * gui/tasks-component.h: Fix location of e-activity-handler.h
+ #include
+
+ * gui/Makefile.am (INCLUDES): add widgets/misc for
+ e-activity-handler.h and e-task-bar.h
+
+ * gui/dialogs/Makefile.am (INCLUDES): Likewise
+
2004-02-02 JP Rosevear <jpr@ximian.com>
* importers/icalendar-importer.c (support_format_fn): use
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ac3b8c353c..5a8e40fc44 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -66,6 +66,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/misc \
-I$(top_srcdir)/a11y/calendar \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index bd6876f63b..fc4e3f3ac1 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -20,6 +20,7 @@ INCLUDES = \
-I$(top_builddir)/calendar/cal-client \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
+ -I$(top_srcdir)/widgets/misc \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index cd54ea5ae3..8f013d74b8 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -25,7 +25,7 @@
#include <bonobo/bonobo-object.h>
#include <libedataserver/e-source-list.h>
-#include <shell/e-activity-handler.h>
+#include <widgets/misc/e-activity-handler.h>
#include <widgets/misc/e-source-selector.h>
#include "Evolution.h"