This commit was manufactured by cvs2svn to create tagEVOLUTION_2_3_3

'EVOLUTION_2_3_3'.

svn path=/tags/EVOLUTION_2_3_3/; revision=29611

31 files changed, 50 insertions, 724 deletions

diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 240d6310f4..3f360d626e 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,44 +1,3 @@
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am
-	* addressbook/Makefile.am
-	* calendar/Makefile.am
-	* widgets/Makefile.am: Use the fake "bootstrap" libraries on Win32
-	to get around circular dependencies. Use NO_UNDEFINED. Use
-	privsolib_LTLIBRARIES instead of privlib_LTLIBRARIES (see
-	../ChangeLog).
-
-	* Makefile.am: No need to pass -I pointing to this directory
-	itself, all inclusions of headers from here are with
-	doublequotes. Link with libeutil. No need to link with REGEX_LIBS.
-
-	* addressbook/Makefile.am
-	* calendar/Makefile.am
-	* widgets/Makefile.am: Prune out superfluous -I options and -D
-	options for EVOLUTION_* pathname macros that aren't used in the
-	source files in that directory.
-
-	* addressbook/Makefile.am: Drop A11Y_CFLAGS, its a subset of
-	EVOLUTION_ADDRESSBOOK_CFLAGS anyway. Link with
-	EVOLUTION_ADDRESSBOOK_LIBS.
-
-	* addressbook/ea-addressbook.c: Include headers from the same
-	directory as such.
-
-	* calendar/Makefile.am: Drop A11Y_CFLAGS, its a subset of
-	EVOLUTION_CALENDAR_CFLAGS anyway. Link with
-	EVOLUTION_CALENDAR_LIBS.
-
-	* e-table/Makefile.am (INCLUDES)
-	* e-text/Makefile.am (INCLUDES): Remove stray trailing slash from
-	-I path, confuses gcc on Win32. Drop the undefined
-	GNOME_BONOBO_CFLAGS and GNOME_INCLUDEDIR. Drop GNOME_FULL_CFLAGS,
-	it's a subset of EXTRA_GNOME_CFLAGS.
-
-	* widgets/Makefile.am: E_WIDGETS_CFLAGS is enough. No need for
-	EVOLUTION_CALENDAR_CFLAGS. Link with E_WIDGET_LIBS. Drop
-	A11Y_CFLAGS, subset of E_WIDGET_CFLAGS.
-
 2005-04-22  Li Yuan  <li.yuan@sun.com>
 
 	* calendar/ea-day-view-main-item.c:
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index 0edcb07bca..c98e486e7f 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -1,38 +1,16 @@
-# Somewhat odd looking to have "." in SUBDIRS, but apparently it works?
-SUBDIRS = e-text e-table . calendar widgets addressbook
-
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS =					\
-	$(top_builddir)/win32/libemiscwidgets.la	\
-	$(top_builddir)/win32/libetable.la		\
-	$(top_builddir)/win32/libetext.la
-endif
+SUBDIRS = . calendar widgets addressbook
 
 # for debug
 #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
 
-privsolib_LTLIBRARIES = libevolution-a11y.la
-
-INCLUDES =				\
-	$(A11Y_CFLAGS)
-
-libevolution_a11y_la_SOURCES =		\
-	ea-factory.h			\
-	ea-cell-table.h			\
-	ea-cell-table.c			\
-	gal-a11y-util.c
-
-libevolution_a11yincludedir = $(privincludedir)/a11y
+privlib_LTLIBRARIES = libevolution-a11y.la
 
-libevolution_a11yinclude_HEADERS =		\
-	gal-a11y-util.h				\
-	gal-a11y-factory.h
+INCLUDES =                                              \
+        -I$(top_srcdir)/a11y                            \
+        $(A11Y_CFLAGS)
 
-libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_a11y_la_SOURCES = 		        \
+        ea-factory.h                            \
+        ea-cell-table.h                         \
+        ea-cell-table.c
 
-libevolution_a11y_la_LIBADD =			\
-	$(WIN32_BOOTSTRAP_LIBS)			\
-	e-text/libgal-a11y-etext.la		\
-	e-table/libgal-a11y-etable.la		\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(EXTRA_GNOME_LIBS)
diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/doc/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/doc/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 400025dce7..d5fc3efb4a 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,26 +1,3 @@
-2005-06-18  Tor Lillqvist  <tml@novell.com>
-
-	* Makefile.am (WIN32_BOOTSTRAP_LIBS): Use bootstrap library for
-	libemisdwidgets. Code here uses e_utf8_to_locale_string() from
-	libemiscwidgets which hasn't been built yet if building from
-	scratch.
-	(INCLUDES) Remove GAL_IMAGESDIR, unused leftover. Add the
-	definitions of EVOLUTION_GLADEDIR, EVOLUTION_HELPDIR,
-	EVOLUTION_ETSPECDIR, SEARCH_RULE_DIR and EVOLUTION_GALVIEWSDIR
-	(for e-win32-reloc.c). Remove undefined GNOME_INCLUDEDIR.
-	(libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED.
-	(libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary
-	libs.
-
-	* e-win32-reloc.c: Update now that it is here in evolution. Use _e
-	prefix instead of _gal. Add getters for more run-time paths.
-
-	* e-util-private.h: Corresponding changes.
-
-2005-06-08  Srinivasa Ragavan <sragavan@novell.com>
-	* e-cursor.[ch]: Added functions to show busy cursor.
-	* Makefile.am: Add the files
-
 2005-05-25  Not Zed  <NotZed@Ximian.com>
 
 	* e-plugin-mono.[ch]: Removed, these are now implemented as a
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 6e8656bb96..e6182ce2b7 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,32 +1,15 @@
 eutilincludedir = $(privincludedir)/e-util
 econdincludedir = $(privincludedir)/e-conduit
 
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la
-PLATFORM_SOURCES = e-win32-reloc.c
-endif
-
 INCLUDES =								\
 	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/widgets						\
-	-DEVOLUTION_PREFIX=\""$(prefix)"\"				\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
-	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
+	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
 	-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\"				\
 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
 	-DEVOLUTION_PLUGINDIR=\""$(plugindir)"\"			\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"			\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"				\
 	-DG_LOG_DOMAIN=\"e-utils\"					\
 	$(GNOME_PILOT_CFLAGS)						\
-	$(EXTRA_GNOME_CFLAGS)                   			\
-	$(GNOME_FULL_CFLAGS)						\
-	$(ICONV_CFLAGS)                        				\
 	$(E_UTIL_CFLAGS)
 
 privlib_LTLIBRARIES = libeutil.la libeconduit.la
@@ -36,11 +19,11 @@ eutilinclude_HEADERS = 				\
 	e-account.h				\
 	e-bconf-map.h				\
 	e-categories-config.h			\
+	e-categories-master-list-wombat.h	\
 	e-component-listener.h			\
 	e-config.h				\
 	e-config-listener.h			\
 	e-corba-utils.h				\
-	e-cursor.h				\
 	e-dialog-utils.h			\
 	e-dialog-widgets.h			\
 	e-error.h				\
@@ -66,30 +49,20 @@ eutilinclude_HEADERS = 				\
 	e-signature-list.h			\
 	e-time-utils.h				\
 	e-uid.h					\
-	md5-utils.h				\
-	e-bit-array.h				\
-	e-iconv.h				\
-	e-sorter.h				\
-	e-sorter-array.h			\
-	e-text-event-processor-emacs-like.h	\
-	e-text-event-processor-types.h		\
-	e-text-event-processor.h		\
-	e-util.h				\
-	e-util-marshal.h			\
-	e-xml-utils.h
+	md5-utils.h
 
 libeutil_la_SOURCES =				\
+	$(MARSHAL_GENERATED)			\
 	$(eutilinclude_HEADERS)			\
-	e-util-marshal.c			\
 	e-account-list.c			\
 	e-account.c				\
 	e-bconf-map.c				\
 	e-categories-config.c			\
+	e-categories-master-list-wombat.c	\
 	e-component-listener.c			\
 	e-config.c				\
 	e-config-listener.c			\
 	e-corba-utils.c				\
-	e-cursor.c				\
 	e-dialog-utils.c			\
 	e-dialog-widgets.c			\
 	e-error.c				\
@@ -117,28 +90,12 @@ libeutil_la_SOURCES =				\
 	e-uid.c					\
 	eggtrayicon.c				\
 	eggtrayicon.h				\
-	md5-utils.c				\
-	e-bit-array.c				\
-	e-i18n.h				\
-	e-iconv.c				\
-	e-sorter.c				\
-	e-sorter-array.c			\
-	e-text-event-processor-emacs-like.c     \
-	e-text-event-processor.c                \
-	e-util.c				\
-	e-util-private.h			\
-	e-xml-utils.c				\
-	$(PLATFORM_SOURCES)
+	md5-utils.c
 
 MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
 @EVO_MARSHAL_RULE@
 
-libeutil_la_LDFLAGS = $(NO_UNDEFINED)
-
-libeutil_la_LIBADD = 		\
-	$(WIN32_BOOTSTRAP_LIBS)	\
-	$(ICONV_LIBS)		\
-	$(E_UTIL_LIBS)
+libeutil_la_LIBADD = $(E_UTIL_LIBS)
 
 econdinclude_HEADERS =		\
 	e-pilot-map.h		\
@@ -157,10 +114,6 @@ endif
 
 libeconduit_la_SOURCES = $(pilot_compile)
 
-libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
-
-libeconduit_la_LIBADD = $(E_UTIL_LIBS)
-
 error_DATA = e-system.error
 errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
diff --git a/e-util/e-categories-master-list-wombat.h b/e-util/e-categories-master-list-wombat.h
index bf951f9150..024d7644e7 100644
--- a/e-util/e-categories-master-list-wombat.h
+++ b/e-util/e-categories-master-list-wombat.h
@@ -2,7 +2,7 @@
 #ifndef _E_CATEGORIES_MASTER_LIST_WOMBAT_H_
 #define _E_CATEGORIES_MASTER_LIST_WOMBAT_H_
 
-#include <misc/e-categories-master-list-array.h>
+#include <gal/widgets/e-categories-master-list-array.h>
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 0dcf9c91a0..67a9a5adf8 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 
 #include "e-mktemp.h"
 
diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c
index 1ff3ed0f78..8f05427a81 100644
--- a/e-util/e-time-utils.c
+++ b/e-util/e-time-utils.c
@@ -17,7 +17,7 @@
 
 #include <time.h>
 #include <sys/time.h>
-#include <misc/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 
 #ifdef __linux__
 #undef _GNU_SOURCE
@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 #include "e-time-utils.h"
 
 
diff --git a/e-util/e-util-marshal.list b/e-util/e-util-marshal.list
index b478efb1ce..463afd8129 100644
--- a/e-util/e-util-marshal.list
+++ b/e-util/e-util-marshal.list
@@ -1,52 +1,2 @@
-BOOLEAN:INT,INT,OBJECT,INT,INT,UINT
-BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT
-BOOLEAN:NONE
-BOOLEAN:OBJECT
-BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-BOOLEAN:POINTER,POINTER,INT,INT,INT
-BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT
-BOOLEAN:STRING,INT
-DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-INT:BOXED
-INT:INT
-INT:INT,INT,BOXED
-INT:INT,POINTER,INT,BOXED
-INT:OBJECT,BOXED
-INT:POINTER
-NONE:BOXED
-NONE:BOXED,INT
-NONE:BOXED,INT,INT
-NONE:DOUBLE
-NONE:INT
-NONE:INT,INT
-NONE:INT,INT,BOXED
-NONE:INT,INT,OBJECT
-NONE:INT,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,POINTER,UINT,UINT
-NONE:INT,INT,OBJECT,UINT
-NONE:INT,INT,STRING,STRING
-NONE:INT,INT,STRING,STRING,POINTER
-NONE:INT,POINTER
-NONE:INT,POINTER,INT,BOXED
-NONE:INT,POINTER,INT,OBJECT
-NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,UINT
-NONE:INT,STRING
 NONE:NONE
 NONE:OBJECT
-NONE:OBJECT,OBJECT
-NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-NONE:POINTER
-NONE:POINTER,BOOLEAN
-NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN
-NONE:POINTER,INT
-NONE:POINTER,INT,INT
-NONE:POINTER,INT,INT,INT
-NONE:POINTER,INT,INT,INT,INT
-NONE:POINTER,INT,OBJECT
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-POINTER:NONE
diff --git a/help/devel/executive-summary/evolution-services.hierarchy b/help/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/help/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/help/devel/importer/evolution-shell-importer.hierarchy b/help/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/help/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 95f86c42cc..b05102092c 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,13 +1,3 @@
-2005-06-23  Kaushal Kumar  <kakumar@novell.com>
-
-	* text/Makefile.am: Set libetextincludedir to text to match 
-	source directory name.
-
-2005-06-21  Kaushal Kumar  <kakumar@novell.com>
-
-	* table/ChangeLog: Added from gal/gal/e-table as Gal is 
-	retired from Head and e-table files are moved here.
-
 2005-05-12  Srinivasa Ragavan <sragavan@novell.com>
 	* misc/e-dateedit.c: (on_time_entry_key_release),
 	(create_children): Fix the bug 303856. Enables OK button
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 8be8fa19bf..4154550db6 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,8 +1,6 @@
 
 SUBDIRS =			\
 	e-timezone-dialog	\
-	table			\
-	text			\
 	misc			\
 	menus
 
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 459eb25afe..30f1734fe8 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -2,49 +2,10 @@ privlib_LTLIBRARIES = libmenus.la
 
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets			\
 	-I$(top_srcdir)/widgets/menus		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"  \
 	-DG_LOG_DOMAIN=\"menus\"		\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(GNOME_INCLUDEDIR)			\
-	$(ICONV_CFLAGS)				\
 	$(GNOME_FULL_CFLAGS)
 
-libmenus_la_SOURCES = 				\
-	gal-view-menus.c			\
-	gal-define-views-dialog.c		\
-	gal-define-views-model.c		\
-	gal-view-collection.c			\
-	gal-view-etable.c			\
-	gal-view-factory-etable.c		\
-	gal-view-factory.c			\
-	gal-view-instance-save-as-dialog.c	\
-	gal-view-instance.c			\
-	gal-view-new-dialog.c			\
-	gal-view.c				\
+libmenus_la_SOURCES = 		\
+	gal-view-menus.c	\
 	gal-view-menus.h
-
-glade_DATA = 					\
-	gal-define-views.glade			\
-	gal-view-new-dialog.glade		\
-	gal-view-instance-save-as-dialog.glade
-
-libmenusincludedir = $(privincludedir)/menus
-
-libmenusinclude_HEADERS =			\
-	gal-define-views-dialog.h		\
-	gal-define-views-model.h		\
-	gal-view-collection.h			\
-	gal-view-etable.h			\
-	gal-view-factory-etable.h		\
-	gal-view-factory.h			\
-	gal-view-instance-save-as-dialog.h	\
-	gal-view-instance.h			\
-	gal-view-new-dialog.h			\
-	gal-view.h
-
-icons =
-EXTRA_DIST =			\
-	 $(icons)		\
-	 $(glade_DATA)
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index f9402c762f..762f845d20 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -22,9 +22,9 @@
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <bonobo/bonobo-ui-util.h>
-#include <e-util/e-util.h>
-#include <e-util/e-xml-utils.h>
-#include <widgets/menus/gal-define-views-dialog.h>
+#include <gal/util/e-util.h>
+#include <gal/util/e-xml-utils.h>
+#include <gal/menus/gal-define-views-dialog.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-list.h>
 
diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h
index 1e857d8e2b..e4de898187 100644
--- a/widgets/menus/gal-view-menus.h
+++ b/widgets/menus/gal-view-menus.h
@@ -4,7 +4,7 @@
 
 #include <libxml/tree.h>
 #include <bonobo/bonobo-ui-component.h>
-#include <widgets/menus/gal-view-instance.h>
+#include <gal/menus/gal-view-instance.h>
 
 #include <glib-object.h>
 
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index b259d2595d..abf787ea78 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,9 +1,3 @@
-2005-06-23  Kaushal Kumar  <kakumar@novell.com>
-
-	* Makefile.am: Use 'misc' for widgetsincludedir, instead of 
-	'widgets', to match source directory name and fix 
-	evolution-exchange build.
-
 2005-05-31  Li Yuan  <li.yuan@sun.com>
 
 	* e-dateedit.c:(e_date_edit_update_date_entry):
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 042bdf5699..03ab98864f 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -1,22 +1,17 @@
 INCLUDES =								\
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/a11y/widgets					\
-	-I$(top_srcdir)/widgets/					\
+	-I$(top_srcdir)/a11y/widgets/					\
 	-DMAP_DIR=\""$(imagesdir)"\"					\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(E_WIDGETS_CFLAGS)						\
-	$(EXTRA_GNOME_CFLAGS)						\
-	$(ICONV_CFLAGS)
-
+	$(E_WIDGETS_CFLAGS)
 
 privlib_LTLIBRARIES =		\
 	libemiscwidgets.la	\
 	libefilterbar.la
 
-widgetsincludedir = $(privincludedir)/misc
+widgetsincludedir = $(privincludedir)/widgets
 
 if ENABLE_PILOT_CONDUITS
 pilot_sources = e-pilot-settings.c
@@ -26,11 +21,7 @@ pilot_sources =
 pilot_headers =
 endif
 
-glade_DATA = e-send-options.glade \
-	     gal-categories.glade
-
-libemiscwidgets_la_LDFLAGS = $(ICONV_LIBS)
-
+glade_DATA = e-send-options.glade
 
 widgetsinclude_HEADERS =			\
 	$(pilot_headers)			\
@@ -56,25 +47,7 @@ widgetsinclude_HEADERS =			\
 	e-task-bar.h				\
 	e-task-widget.h				\
 	e-send-options.h			\
-	e-url-entry.h				\
-	e-canvas-background.h			\
-	e-canvas-utils.h			\
-	e-canvas-vbox.h				\
-	e-canvas.h				\
-	e-cursors.h				\
-	e-gui-utils.h				\
-	e-hsv-utils.h				\
-	e-popup-menu.h				\
-	e-printable.h				\
-	e-reflow-model.h			\
-	e-reflow.h				\
-	e-selection-model-array.h		\
-	e-selection-model-simple.h		\
-	e-selection-model.h			\
-	e-unicode.h				\
-	e-colors.h				\
-	gal-combo-box.h				\
-	gal-combo-text.h
+	e-url-entry.h
 
 libemiscwidgets_la_SOURCES =			\
 	$(MARSHAL_GENERATED)			\
@@ -102,34 +75,13 @@ libemiscwidgets_la_SOURCES =			\
 	e-task-bar.c				\
 	e-task-widget.c				\
 	e-send-options.c			\
-	e-url-entry.c				\
-	e-canvas-background.c			\
-	e-canvas-utils.c			\
-	e-canvas-vbox.c				\
-	e-canvas.c				\
-	e-cursors.c				\
-	e-gui-utils.c				\
-	e-hsv-utils.c				\
-	e-popup-menu.c				\
-	e-printable.c				\
-	e-reflow-model.c			\
-	e-reflow.c				\
-	e-selection-model-array.c		\
-	e-selection-model-simple.c		\
-	e-selection-model.c			\
-	e-unicode.c				\
-	e-colors.c				\
-	gal-combo-box.c				\
-	gal-combo-text.c
+	e-url-entry.c
 
 MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
 @EVO_MARSHAL_RULE@
 
 libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/widgets/table/libetable.la			\
-	$(top_builddir)/widgets/text/libetext.la			\
 	$(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la	\
-	$(top_builddir)/a11y/libevolution-a11y.la			\
 	$(E_WIDGETS_LIBS)
 
 libefilterbar_la_SOURCES =	\
@@ -204,6 +156,4 @@ EXTRA_DIST =			\
 	ChangeLog.pre-1-4
 
 dist-hook:
-	-mkdir $(distdir)/pixmaps
-	cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 8274df5556..cdbe7518b5 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -32,7 +32,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
 
-#include <misc/e-popup-menu.h>
+#include <gal/widgets/e-popup-menu.h>
 
 #define ICON_SIZE 16
 
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 010d5f6c7a..c3134c07fe 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -44,7 +44,7 @@
 #include <gtk/gtksignal.h>
 #include <gdk/gdkkeysyms.h>
 #include <libgnome/gnome-i18n.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 
 static const int e_calendar_item_days_in_month[12] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 6ad4df1150..1fe6d2500c 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -24,7 +24,7 @@
 #define _E_CALENDAR_H_
 
 #include <gtk/gtkwidget.h>
-#include <misc/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
 #include "e-calendar-item.h"
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 5f27f0349a..12167e3185 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -40,8 +40,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <table/e-table-item.h>
-#include <table/e-cell-text.h>
+#include <gal/e-table/e-table-item.h>
+#include <gal/e-table/e-cell-text.h>
 
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnome/gnome-i18n.h>
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
index dba88b8f65..6f1dacbb58 100644
--- a/widgets/misc/e-cell-date-edit.h
+++ b/widgets/misc/e-cell-date-edit.h
@@ -30,7 +30,7 @@
 #define _E_CELL_DATE_EDIT_H_
 
 #include <time.h>
-#include <table/e-cell-popup.h>
+#include <gal/e-table/e-cell-popup.h>
 
 #define E_CELL_DATE_EDIT_TYPE        (e_cell_date_edit_get_type ())
 #define E_CELL_DATE_EDIT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_DATE_EDIT_TYPE, ECellDateEdit))
diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h
index c738631ebf..6207e0c878 100644
--- a/widgets/misc/e-cell-percent.h
+++ b/widgets/misc/e-cell-percent.h
@@ -29,7 +29,7 @@
 #ifndef _E_CELL_PERCENT_H_
 #define _E_CELL_PERCENT_H_
 
-#include <table/e-cell-text.h>
+#include <gal/e-table/e-cell-text.h>
 
 #define E_CELL_PERCENT_TYPE        (e_cell_percent_get_type ())
 #define E_CELL_PERCENT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_PERCENT_TYPE, ECellPercent))
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 739146710b..ddd4e3f4dc 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -58,7 +58,7 @@
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
 #include <libgnome/gnome-i18n.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 #include "e-util/e-time-utils.h"
 #include "e-calendar.h"
 
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index fb850bc597..499ef97554 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -28,11 +28,11 @@
 
 #include "e-clipped-label.h"
 
-#include <table/e-table-scrolled.h>
-#include <table/e-table-memory-store.h>
-#include <table/e-cell-pixbuf.h>
-#include <table/e-cell-vbox.h>
-#include <table/e-cell-text.h>
+#include <gal/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-table-memory-store.h>
+#include <gal/e-table/e-cell-pixbuf.h>
+#include <gal/e-table/e-cell-vbox.h>
+#include <gal/e-table/e-cell-text.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index d957da1d04..72a4494dc4 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -36,8 +36,8 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkmain.h>
 
-#include <misc/e-unicode.h>
-#include <misc/e-gui-utils.h>
+#include <gal/widgets/e-unicode.h>
+#include <gal/widgets/e-gui-utils.h>
 
 #include <libgnome/gnome-i18n.h>
 
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c
index 2e28a6c76a..3ed243e18f 100644
--- a/widgets/misc/e-task-bar.c
+++ b/widgets/misc/e-task-bar.c
@@ -26,7 +26,7 @@
 
 #include "e-task-bar.h"
 
-#include "misc/e-clipped-label.h"
+#include "widgets/misc/e-clipped-label.h"
 
 struct _ETaskBarPrivate
 {
diff --git a/widgets/misc/e-util-marshal.list b/widgets/misc/e-util-marshal.list
index b478efb1ce..787be7d723 100644
--- a/widgets/misc/e-util-marshal.list
+++ b/widgets/misc/e-util-marshal.list
@@ -1,52 +1,4 @@
-BOOLEAN:INT,INT,OBJECT,INT,INT,UINT
-BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT
-BOOLEAN:NONE
-BOOLEAN:OBJECT
-BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-BOOLEAN:POINTER,POINTER,INT,INT,INT
-BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT
-BOOLEAN:STRING,INT
-DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-INT:BOXED
-INT:INT
-INT:INT,INT,BOXED
-INT:INT,POINTER,INT,BOXED
-INT:OBJECT,BOXED
-INT:POINTER
-NONE:BOXED
-NONE:BOXED,INT
-NONE:BOXED,INT,INT
-NONE:DOUBLE
-NONE:INT
-NONE:INT,INT
-NONE:INT,INT,BOXED
-NONE:INT,INT,OBJECT
-NONE:INT,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,INT,OBJECT,POINTER,UINT,UINT
-NONE:INT,INT,OBJECT,UINT
-NONE:INT,INT,STRING,STRING
-NONE:INT,INT,STRING,STRING,POINTER
-NONE:INT,POINTER
-NONE:INT,POINTER,INT,BOXED
-NONE:INT,POINTER,INT,OBJECT
-NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
-NONE:INT,POINTER,INT,OBJECT,UINT
-NONE:INT,STRING
 NONE:NONE
-NONE:OBJECT
-NONE:OBJECT,OBJECT
-NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+NONE:INT
 NONE:POINTER
-NONE:POINTER,BOOLEAN
-NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN
-NONE:POINTER,INT
-NONE:POINTER,INT,INT
-NONE:POINTER,INT,INT,INT
-NONE:POINTER,INT,INT,INT,INT
-NONE:POINTER,INT,OBJECT
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,INT
-OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN
-POINTER:NONE
+BOOLEAN:OBJECT,BOXED
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
deleted file mode 100644
index 37ac85770f..0000000000
--- a/widgets/table/e-table-example-1.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-example-1.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 10
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-char *table_data [ROWS] [COLS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	return (void *) table_data [row] [col];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_free (table_data [row] [col]);
-	table_data [row] [col] = g_strdup (val);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < COLS; j++)
-			table_data [i] [j] = g_strdup ("");
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value, 
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * Here we create the table.  We give it the three pieces of
-	 * the table we've created, the header, the model, and the
-	 * initial layout.  It does the rest.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-