25 files changed, 25 insertions, 26 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 0f669eee4f..b919da8cf3 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,5 +1,5 @@
 if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail-shared.la
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
 endif
 
 SUBDIRS = alarm-notify dialogs
@@ -24,7 +24,6 @@ INCLUDES =						\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/a11y/calendar			\
 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
@@ -177,30 +176,30 @@ libcal_gui_la_SOURCES =		\
 	weekday-picker.h
 
 # no gnome-cal no a11y. FIXME: KILL-BONOBO
-#	a11y/ea-calendar.c			\
-#	a11y/ea-calendar.h			\
-#	a11y/ea-calendar-helpers.c		\
-#	a11y/ea-calendar-helpers.h		\
-#	a11y/ea-cal-view.c			\
-#	a11y/ea-cal-view.h			\
-#	a11y/ea-cal-view-event.c		\
-#	a11y/ea-cal-view-event.h		\
-#	a11y/ea-day-view.c			\
-#	a11y/ea-day-view.h			\
-#	a11y/ea-day-view-main-item.c		\
-#	a11y/ea-day-view-main-item.h		\
-#	a11y/ea-day-view-cell.c			\
-#	a11y/ea-day-view-cell.h			\
-#	a11y/ea-week-view.c			\
-#	a11y/ea-week-view.h			\
-#	a11y/ea-week-view-main-item.c		\
-#	a11y/ea-week-view-main-item.h		\
-#	a11y/ea-week-view-cell.c		\
-#	a11y/ea-week-view-cell.h		\
-#	a11y/ea-jump-button.c			\
-#	a11y/ea-jump-button.h			\
-#	a11y/ea-gnome-calendar.c		\
-#	a11y/ea-gnome-calendar.h
+#	ea-calendar.c			\
+#	ea-calendar.h			\
+#	ea-calendar-helpers.c		\
+#	ea-calendar-helpers.h		\
+#	ea-cal-view.c			\
+#	ea-cal-view.h			\
+#	ea-cal-view-event.c		\
+#	ea-cal-view-event.h		\
+#	ea-day-view.c			\
+#	ea-day-view.h			\
+#	ea-day-view-main-item.c		\
+#	ea-day-view-main-item.h		\
+#	ea-day-view-cell.c			\
+#	ea-day-view-cell.h			\
+#	ea-week-view.c			\
+#	ea-week-view.h			\
+#	ea-week-view-main-item.c		\
+#	ea-week-view-main-item.h		\
+#	ea-week-view-cell.c		\
+#	ea-week-view-cell.h		\
+#	ea-jump-button.c			\
+#	ea-jump-button.h			\
+#	ea-gnome-calendar.c		\
+#	ea-gnome-calendar.h
 
 libcal_gui_la_LIBADD =					\
 	$(top_builddir)/composer/libcomposer.la				\
diff --git a/calendar/gui/a11y/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 5da164323f..5da164323f 100644
--- a/calendar/gui/a11y/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
diff --git a/calendar/gui/a11y/ea-cal-view-event.h b/calendar/gui/ea-cal-view-event.h
index 548e42b4a7..548e42b4a7 100644
--- a/calendar/gui/a11y/ea-cal-view-event.h
+++ b/calendar/gui/ea-cal-view-event.h
diff --git a/calendar/gui/a11y/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 952afcc791..952afcc791 100644
--- a/calendar/gui/a11y/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
diff --git a/calendar/gui/a11y/ea-cal-view.h b/calendar/gui/ea-cal-view.h
index 959f7816b5..959f7816b5 100644
--- a/calendar/gui/a11y/ea-cal-view.h
+++ b/calendar/gui/ea-cal-view.h
diff --git a/calendar/gui/a11y/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index f07cdfa086..f07cdfa086 100644
--- a/calendar/gui/a11y/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
diff --git a/calendar/gui/a11y/ea-calendar-helpers.h b/calendar/gui/ea-calendar-helpers.h
index a4045cd7af..a4045cd7af 100644
--- a/calendar/gui/a11y/ea-calendar-helpers.h
+++ b/calendar/gui/ea-calendar-helpers.h
diff --git a/calendar/gui/a11y/ea-calendar.c b/calendar/gui/ea-calendar.c
index d09efae4d2..d09efae4d2 100644
--- a/calendar/gui/a11y/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
diff --git a/calendar/gui/a11y/ea-calendar.h b/calendar/gui/ea-calendar.h
index b2238ffdbc..b2238ffdbc 100644
--- a/calendar/gui/a11y/ea-calendar.h
+++ b/calendar/gui/ea-calendar.h
diff --git a/calendar/gui/a11y/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index fa491e87ea..fa491e87ea 100644
--- a/calendar/gui/a11y/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
diff --git a/calendar/gui/a11y/ea-day-view-cell.h b/calendar/gui/ea-day-view-cell.h
index 669fb1abae..669fb1abae 100644
--- a/calendar/gui/a11y/ea-day-view-cell.h
+++ b/calendar/gui/ea-day-view-cell.h
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index 3bfd56f0b3..3bfd56f0b3 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
diff --git a/calendar/gui/a11y/ea-day-view-main-item.h b/calendar/gui/ea-day-view-main-item.h
index c782e6acc8..c782e6acc8 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.h
+++ b/calendar/gui/ea-day-view-main-item.h
diff --git a/calendar/gui/a11y/ea-day-view.c b/calendar/gui/ea-day-view.c
index 9eb3e343f3..9eb3e343f3 100644
--- a/calendar/gui/a11y/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
diff --git a/calendar/gui/a11y/ea-day-view.h b/calendar/gui/ea-day-view.h
index 33399f6600..33399f6600 100644
--- a/calendar/gui/a11y/ea-day-view.h
+++ b/calendar/gui/ea-day-view.h
diff --git a/calendar/gui/a11y/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index e5d9654c1a..e5d9654c1a 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
diff --git a/calendar/gui/a11y/ea-gnome-calendar.h b/calendar/gui/ea-gnome-calendar.h
index b0d2cf71d2..b0d2cf71d2 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.h
+++ b/calendar/gui/ea-gnome-calendar.h
diff --git a/calendar/gui/a11y/ea-jump-button.c b/calendar/gui/ea-jump-button.c
index eb24bea42c..eb24bea42c 100644
--- a/calendar/gui/a11y/ea-jump-button.c
+++ b/calendar/gui/ea-jump-button.c
diff --git a/calendar/gui/a11y/ea-jump-button.h b/calendar/gui/ea-jump-button.h
index cd3b6e26bb..cd3b6e26bb 100644
--- a/calendar/gui/a11y/ea-jump-button.h
+++ b/calendar/gui/ea-jump-button.h
diff --git a/calendar/gui/a11y/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index e724592ec8..e724592ec8 100644
--- a/calendar/gui/a11y/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
diff --git a/calendar/gui/a11y/ea-week-view-cell.h b/calendar/gui/ea-week-view-cell.h
index 1524e9d3a8..1524e9d3a8 100644
--- a/calendar/gui/a11y/ea-week-view-cell.h
+++ b/calendar/gui/ea-week-view-cell.h
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index 74f4695a69..74f4695a69 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
diff --git a/calendar/gui/a11y/ea-week-view-main-item.h b/calendar/gui/ea-week-view-main-item.h
index d9110160c4..d9110160c4 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.h
+++ b/calendar/gui/ea-week-view-main-item.h
diff --git a/calendar/gui/a11y/ea-week-view.c b/calendar/gui/ea-week-view.c
index 97a8dae25d..97a8dae25d 100644
--- a/calendar/gui/a11y/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
diff --git a/calendar/gui/a11y/ea-week-view.h b/calendar/gui/ea-week-view.h
index bb71c17e74..bb71c17e74 100644
--- a/calendar/gui/a11y/ea-week-view.h
+++ b/calendar/gui/ea-week-view.h