Remove a bunch of gal includes that are no longer needed

2003-11-20  JP Rosevear <jpr@ximian.com>

	* Remove a bunch of gal includes that are no longer needed

svn path=/trunk/; revision=23457

30 files changed, 28 insertions, 50 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 757916940a..9036cb7f28 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-20  JP Rosevear <jpr@ximian.com>
+
+	* Remove a bunch of gal includes that are no longer needed
+
 2003-11-19  Rodrigo Moya <rodrigo@ximian.com>
 
 	Fixes #43556
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 7d521ccc6a..b670939538 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -16,17 +16,20 @@ libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeconduit.la	 			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-calendar.conduit: e-calendar.conduit.in Makefile
+e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
 	sed -e 's^\@prefix\@^$(prefix)^g' 				\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp 	\
-	&& mv e-calendar.conduit.tmp e-calendar.conduit
+	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+	    $< > $@
 
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-calendar.conduit
+conduitdir = $(datadir)/gnome-pilot/conduits/
+conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+
+BUILT_SOURCES = $(conduit_DATA)
+CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
 	e-calendar.conduit.in
 
-install-data-local:
-	$(mkinstalldirs) $(Conduitdir)
+dist-hook:
+	cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
index e75d889234..3bf0c3b9ae 100644
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ b/calendar/conduits/calendar/e-calendar.conduit.in
@@ -1,7 +1,7 @@
 <gnome-pilot-conduit version="1.0">
 	<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
 	<name value="ECalendar"/>
-	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
+	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution @BASE_VERSION@"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
 	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
      	<conduit-attribute name="settings" value="TRUE"/>
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 4b4fccc732..0de69d0f66 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -16,17 +16,20 @@ libetodo_conduit_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeconduit.la		 		\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-todo.conduit: e-todo.conduit.in Makefile
+e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
 	sed -e 's^\@prefix\@^$(prefix)^g' 				\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp 		\
-	&& mv e-todo.conduit.tmp e-todo.conduit
+	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+	    $< > $@
 
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-todo.conduit
+conduitdir = $(datadir)/gnome-pilot/conduits/
+conduit_DATA = e-todo-$(BASE_VERSION).conduit
+
+BUILT_SOURCES = $(conduit_DATA)
+CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
 	e-todo.conduit.in
 
-install-data-local:
-	$(mkinstalldirs) $(Conduitdir)
+dist-hook:
+	cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
index a7bea27a8f..1bfe02045c 100644
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ b/calendar/conduits/todo/e-todo.conduit.in
@@ -1,7 +1,7 @@
 <gnome-pilot-conduit version="1.0">
 	<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
 	<name value="EToDo"/>
-	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
+	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution @BASE_VERSION@"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
 	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
      	<conduit-attribute name="settings" value="TRUE"/>
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index d1db74ae80..e7c87c2156 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -34,7 +34,6 @@
 #include <libgnomeui/gnome-window-icon.h>
 #include <glade/glade.h>
 #include <e-util/e-time-utils.h>
-#include <gal/widgets/e-unicode.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 3bc9143215..477a6d91a7 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -30,7 +30,6 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/util/e-util.h>
 #include "cal-search-bar.h"
 
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index db40dde2e7..5c745fff32 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <string.h>
+#include <gtk/gtklabel.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreeview.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtkoptionmenu.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-time-utils.h"
 #include <libecal/e-cal-util.h>
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 3e9d76dead..27f9b9b91e 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -26,7 +26,6 @@
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
 #include "cancel-comp.h"
 
 
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 799a22579b..af595fe1df 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -26,7 +26,6 @@
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
 #include "changed-comp.h"
 
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 3b2b32f17a..cd270eb423 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -37,7 +37,6 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-ui-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <e-util/e-dialog-utils.h>
 #include <evolution-shell-component-utils.h>
 #include "../print.h"
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index adaa8895fa..c4f9e5dc3d 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -26,7 +26,6 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-unicode.h>
 #include "../calendar-config.h"
 #include "delete-comp.h"
 
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index bc9c958862..cb076885c1 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -26,7 +26,6 @@
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
 #include "delete-error.h"
 
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 9b3a00e6cc..ac117a0039 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <glade/glade.h>
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <libgnome/gnome-i18n.h>
 #include <widgets/misc/e-dateedit.h>
 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 9bede0f4b5..c943825c84 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -31,7 +31,6 @@
 #include <gtk/gtktogglebutton.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-categories.h>
 #include "e-util/e-categories-config.h"
 #include "e-util/e-dialog-widgets.h"
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 4c7edeebfe..fe4ade9363 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -35,8 +35,6 @@
 #include <glade/glade.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <gal/util/e-util.h>
-#include <gal/e-table/e-table.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-popup-menu.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <widgets/misc/e-dateedit.h>
@@ -694,8 +692,6 @@ meeting_page_construct (MeetingPage *mpage, EMeetingStore *ems,
 			ECal *client)
 {
 	MeetingPagePrivate *priv;
-	ETable *real_table;
-	gchar *filename;
 	char *backend_address;
 	EIterator *it;
 	EAccount *def_account;
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 82648fe84d..f097d542f7 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
 #include "recur-comp.h"
 
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5eadb2925a..48e9bd1655 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -28,6 +28,7 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtklabel.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkoptionmenu.h>
@@ -38,7 +39,6 @@
 #include <gtk/gtktreeselection.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-time-utils.h>
 #include <widgets/misc/e-dateedit.h>
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 548c210b46..8041395fb1 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-unicode.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
 #include "save-comp.h"
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 50969e2511..fc91916345 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -33,14 +33,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include <glade/glade.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <widgets/misc/e-dateedit.h>
 #include <e-util/e-dialog-widgets.h>
 #include "../calendar-config.h"
 #include "../e-meeting-time-sel.h"
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 3075747a92..65e4743c04 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -26,7 +26,6 @@
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <gal/widgets/e-unicode.h>
 #include "send-comp.h"
 
 
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index ebd4b17f85..5d75c9b39a 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -29,7 +29,6 @@
 #include <gtk/gtktogglebutton.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
 #include <widgets/misc/e-dateedit.h>
 #include <widgets/misc/e-url-entry.h>
 #include "e-util/e-dialog-widgets.h"
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index c30704e3cf..166dc538ba 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <glade/glade.h>
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "task-page.h"
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 46c35b70db..830e5a0bef 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -33,7 +33,6 @@
 #include <gtk/gtkoptionmenu.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-categories.h>
 #include <widgets/misc/e-dateedit.h>
 #include "e-util/e-dialog-widgets.h"
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index c504695ada..74973e36f7 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -41,7 +41,6 @@
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkwindow.h>
 #include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/util/e-util.h>
 #include <gal/e-table/e-table-memory-store.h>
 #include <gal/e-table/e-cell-checkbox.h>
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 3d045fbdd6..d487a78ae4 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -36,7 +36,6 @@
 #include <libgnomeui/gnome-stock-icons.h> 
 #include <libgnome/gnome-i18n.h>
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 9df137866a..95341b1fdf 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -39,7 +39,6 @@
 #include <libgnomeui/gnome-dialog-util.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
-#include <gal/widgets/e-unicode.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <libical/ical.h>
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index c23cc3e03b..c4e2af01a7 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -35,7 +35,6 @@
 #include <gtk/gtksignal.h>
 #include <gnome.h>
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include "e-timezone-entry.h"
 
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 2ea27974fd..bcbb6a5880 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -30,7 +30,6 @@
 #include <libgnome/gnome-i18n.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkwidget.h>
-#include <gal/widgets/e-unicode.h>
 #include <gal/util/e-util.h>
 #include <libical/ical.h>
 #include <Evolution-Composer.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 2bea5a915a..1e647c096b 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -44,7 +44,6 @@
 #include <gal/util/e-util.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-time-utils.h>
-#include <gal/widgets/e-unicode.h>
 #include <libecal/e-cal-time-util.h>
 #include "calendar-commands.h"
 #include "calendar-config.h"