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

13 files changed, 24 insertions, 128 deletions

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