From 27a61acf278caf11e5e203d4ee13e107d5b84b2d Mon Sep 17 00:00:00 2001
From: Kaushal Kumar <kakumar@novell.com>
Date: Fri, 17 Jun 2005 15:20:35 +0000
Subject: Retired GAL from Head. The relevant files have moved inside
 evolution.

2005-06-17  Kaushal Kumar  <kakumar@novell.com>

        * Retired GAL from Head. The relevant files have moved inside
        evolution. Thanks to JP Rosevear for performing the cvs surgery. The
        files have been moved in the following order.

        evolution/e-util <- gal/gal/util
        evolution/a11y <-  gal/gal/a11y
        evolution/a11y/e-table <- gal/gal/a11y/e-table
        evolution/a11y/e-text <- gal/gal/a11y/e-text
        evolution/widgets/table <- gal/gal/e-table
        evolution/widgets/text <- gal/gal/e-text
        evolution/widgets/misc <- gal/gal/widgets
        evolution/widgets/misc/pixmaps <- gal/gal/widgets/pixmaps
        evolution/widgets/menus <- gal/gal/menus

        Following is the summary of changes done to fix the build:-
        - New files added to cvs repository,
                - a11y/e-table/Makefile.am
                - a11y/e-text/Makefile.am
                - widgets/table/Makefile.am
                - widgets/text/Makefile.am
                - widgets/misc/pixmaps/Makefile.am
                - iconv-detect.h
                - iconv-detect.c
        - Updated configure.in.
        - Updated all the relevant Makefile.am files.
        - Updated the include paths to replace all gal references.
        - Updated the marshal list to suit gal files requirements.

svn path=/trunk/; revision=29522
---
 calendar/gui/calendar-config.c        |  2 +-
 calendar/gui/calendar-view-factory.h  |  2 +-
 calendar/gui/calendar-view.h          |  2 +-
 calendar/gui/dialogs/Makefile.am      |  1 +
 calendar/gui/dialogs/meeting-page.c   |  2 +-
 calendar/gui/e-cal-list-view.c        | 14 +++++++-------
 calendar/gui/e-cal-model.h            |  2 +-
 calendar/gui/e-calendar-table.c       | 10 +++++-----
 calendar/gui/e-calendar-table.h       |  2 +-
 calendar/gui/e-cell-date-edit-text.c  |  2 +-
 calendar/gui/e-cell-date-edit-text.h  |  2 +-
 calendar/gui/e-day-view-time-item.c   |  2 +-
 calendar/gui/e-day-view.c             | 10 +++++-----
 calendar/gui/e-meeting-time-sel.c     |  4 ++--
 calendar/gui/e-meeting-time-sel.h     |  6 +++---
 calendar/gui/e-tasks.c                |  8 ++++----
 calendar/gui/e-week-view-event-item.c |  2 +-
 calendar/gui/e-week-view.c            |  8 ++++----
 calendar/gui/gnome-cal.c              |  6 +++---
 calendar/gui/print.c                  |  2 +-
 20 files changed, 45 insertions(+), 44 deletions(-)

(limited to 'calendar')

diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index cab9ee58ff..d8d21b0f5b 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <time.h>
 #include <libgnomeui/gnome-dialog.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include <libecal/e-cal-time-util.h>
 
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
index 6d1de25590..5febd7d833 100644
--- a/calendar/gui/calendar-view-factory.h
+++ b/calendar/gui/calendar-view-factory.h
@@ -21,7 +21,7 @@
 #ifndef CALENDAR_VIEW_FACTORY_H
 #define CALENDAR_VIEW_FACTORY_H
 
-#include <gal/menus/gal-view-factory.h>
+#include <widgets/menus/gal-view-factory.h>
 #include "gnome-cal.h"
 
 G_BEGIN_DECLS
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index 8b85966a90..bac7d8e246 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -21,7 +21,7 @@
 #ifndef CALENDAR_VIEW_H
 #define CALENDAR_VIEW_H
 
-#include <gal/menus/gal-view.h>
+#include <widgets/menus/gal-view.h>
 #include "gnome-cal.h"
 
 G_BEGIN_DECLS
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 11cdf3bd6d..a83d4ee7a2 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"calendar-gui\"					\
 	-I$(top_srcdir)							\
+	-I$(top_srcdir)/widgets						\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)/calendar					\
 	-I$(top_srcdir)/calendar/cal-client				\
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 7290110a8d..263a415f41 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -35,7 +35,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <libgnomeui/gnome-stock-icons.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <widgets/misc/e-gui-utils.h>
 #include <widgets/misc/e-dateedit.h>
 #include <e-util/e-dialog-utils.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 6a5915c89c..f82c9320b5 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -42,13 +42,13 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkwindow.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-table/e-table-memory-store.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-combo.h>
-#include <gal/widgets/e-popup-menu.h>
+#include <widgets/misc/e-gui-utils.h>
+#include <table/e-table-memory-store.h>
+#include <table/e-cell-checkbox.h>
+#include <table/e-cell-toggle.h>
+#include <table/e-cell-text.h>
+#include <table/e-cell-combo.h>
+#include <widgets/misc/e-popup-menu.h>
 #include <widgets/misc/e-cell-date-edit.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-exec.h>
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index d5e2fc4960..8a2eec933e 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -22,7 +22,7 @@
 #ifndef E_CAL_MODEL_H
 #define E_CAL_MODEL_H
 
-#include <gal/e-table/e-table-model.h>
+#include <table/e-table-model.h>
 #include <libecal/e-cal.h>
 #include "e-cell-date-edit-text.h"
 
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index a3d50bb475..675aac86f7 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -34,11 +34,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <gnome.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-combo.h>
+#include <widgets/misc/e-gui-utils.h>
+#include <table/e-cell-checkbox.h>
+#include <table/e-cell-toggle.h>
+#include <table/e-cell-text.h>
+#include <table/e-cell-combo.h>
 #include <e-util/e-dialog-utils.h>
 #include <widgets/misc/e-cell-date-edit.h>
 #include <widgets/misc/e-cell-percent.h>
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index 48af37831a..e9fcb06af6 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -25,7 +25,7 @@
 #define _E_CALENDAR_TABLE_H_
 
 #include <gtk/gtktable.h>
-#include <gal/e-table/e-table-scrolled.h>
+#include <table/e-table-scrolled.h>
 #include <widgets/misc/e-cell-date-edit.h>
 #include "e-activity-handler.h"
 #include "e-cal-model.h"
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 635aaf0032..b72330d75c 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -37,7 +37,7 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock-icons.h> 
 #include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <e-util/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index ab00c0b39c..2ca74b7756 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -30,7 +30,7 @@
 #define _E_CELL_DATE_EDIT_TEXT_H_
 
 #include <libical/ical.h>
-#include <gal/e-table/e-cell-text.h>
+#include <table/e-cell-text.h>
 
 G_BEGIN_DECLS
 
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index ae57439a10..eefbeef5e5 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -37,7 +37,7 @@
 #include <gtk/gtkradiomenuitem.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <widgets/misc/e-gui-utils.h>
 #include "e-day-view-time-item.h"
 #include "calendar-config.h"
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 9dbfd5990a..dc24ba258e 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -42,11 +42,11 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkwindow.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
+#include <text/e-text.h>
+#include <widgets/misc/e-canvas-utils.h>
+#include <widgets/misc/e-popup-menu.h>
+#include <widgets/misc/e-gui-utils.h>
+#include <widgets/misc/e-unicode.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-exec.h>
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 5f92ab6a63..74b68d7153 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -54,8 +54,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
 
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
+#include <widgets/misc/e-canvas.h>
+#include <widgets/misc/e-canvas-utils.h>
 
 #include <widgets/misc/e-dateedit.h>
 #include <e-util/e-gui-utils.h>
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index b3ff09f18f..5a4b94ff1e 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -28,9 +28,9 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkwidget.h>
 #include <libgnomecanvas/gnome-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/e-table/e-table.h>
+#include <text/e-text.h>
+#include <table/e-table-model.h>
+#include <table/e-table.h>
 #include "e-meeting-store.h"
 #include "e-meeting-list-view.h"
 
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 3845b62bba..22d94983ac 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -28,10 +28,10 @@
 
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/menus/gal-view-instance.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
+#include <table/e-table-scrolled.h>
+#include <widgets/menus/gal-view-instance.h>
+#include <widgets/menus/gal-view-factory-etable.h>
+#include <widgets/menus/gal-view-etable.h>
 
 #include "e-util/e-error.h"
 #include "e-util/e-categories-config.h"
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 4bb3fe089a..5b3312e696 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -36,7 +36,7 @@
 #include "e-week-view-event-item.h"
 
 #include <gtk/gtksignal.h>
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 
 static void e_week_view_event_item_set_arg	(GtkObject	 *o,
 						 GtkArg		 *arg,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 36e81049e1..4f6d3b2f2a 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -46,10 +46,10 @@
 #include <libgnome/gnome-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
+#include <text/e-text.h>
+#include <widgets/misc/e-canvas-utils.h>
+#include <widgets/misc/e-gui-utils.h>
+#include <widgets/misc/e-unicode.h>
 #include <e-util/e-categories-config.h>
 #include <e-util/e-dialog-utils.h>
 #include "dialogs/delete-comp.h"
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 0a038e4539..abd3cbb4a3 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -47,9 +47,9 @@
 #include "e-util/e-config-listener.h"
 #include "shell/e-user-creatable-items-handler.h"
 #include <libecal/e-cal-time-util.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <gal/menus/gal-define-views-dialog.h>
+#include <widgets/menus/gal-view-factory-etable.h>
+#include <widgets/menus/gal-view-etable.h>
+#include <widgets/menus/gal-define-views-dialog.h>
 #include "widgets/menus/gal-view-menus.h"
 #include "e-util/e-error.h"
 #include "e-comp-editor-registry.h"
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index fceb6c06ef..0fdd717abb 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -44,7 +44,7 @@
 #include <libgnomeprintui/gnome-print-paper-selector.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-time-utils.h>
 #include <e-util/e-print.h>
-- 
cgit