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

18 files changed, 94 insertions, 57 deletions

diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
new file mode 100644
index 0000000000..7e1980e73a
--- /dev/null
+++ b/widgets/text/Makefile.am
@@ -0,0 +1,37 @@
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/widgets			\
+	$(GNOME_INCLUDEDIR)			\
+	$(ICONV_CFLAGS)				\
+	$(EXTRA_GNOME_CFLAGS)			\
+        $(GNOME_FULL_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"e-text\"
+
+
+privlib_LTLIBRARIES = libetext.la
+
+libetext_la_SOURCES =				\
+	e-entry.c				\
+	e-completion-match.c			\
+	e-completion.c				\
+	e-completion-callbacks.c		\
+	e-completion-view.c			\
+	e-table-text-model.c			\
+	e-text-model-repos.c			\
+	e-text-model.c				\
+	e-text-model-uri.c                      \
+	e-text.c
+
+libetextincludedir = $(privincludedir)/e-text
+
+libetextinclude_HEADERS = 			\
+	e-entry.h				\
+	e-completion-match.h			\
+	e-completion.h				\
+	e-completion-callbacks.h		\
+	e-completion-view.h			\
+	e-table-text-model.h			\
+	e-text-model-repos.h			\
+	e-text-model.h				\
+	e-text-model-uri.h			\
+	e-text.h
diff --git a/widgets/text/e-completion-callbacks.c b/widgets/text/e-completion-callbacks.c
index a7c3c48d97..b819513141 100644
--- a/widgets/text/e-completion-callbacks.c
+++ b/widgets/text/e-completion-callbacks.c
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
 
 #include "e-completion-callbacks.h"
 
diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c
index 180a16e657..df64bc8bd2 100644
--- a/widgets/text/e-completion-match.c
+++ b/widgets/text/e-completion-match.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "gal/widgets/e-unicode.h"
+#include "widgets/misc/e-unicode.h"
 
 #include "e-completion-match.h"
 
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index 13c9ca2860..e7606fc805 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -28,10 +28,10 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "gal/e-table/e-table-scrolled.h"
-#include "gal/e-table/e-table-simple.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-marshal.h"
+#include "table/e-table-scrolled.h"
+#include "table/e-table-simple.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util-marshal.h"
 
 #include "e-completion-view.h"
 
@@ -220,7 +220,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, nonempty),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_ADDED] =
@@ -229,7 +229,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, added),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_FULL] =
@@ -238,7 +238,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, full),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] =
@@ -247,7 +247,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, browse),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER,
+			      e_util_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
@@ -257,7 +257,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, unbrowse),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] =
@@ -266,7 +266,7 @@ e_completion_view_class_init (ECompletionViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionViewClass, activate),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER,
+			      e_util_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
diff --git a/widgets/text/e-completion-view.h b/widgets/text/e-completion-view.h
index 25b2eff645..5e2d6f8532 100644
--- a/widgets/text/e-completion-view.h
+++ b/widgets/text/e-completion-view.h
@@ -26,7 +26,7 @@
 #define E_COMPLETION_VIEW_H
 
 #include <gtk/gtk.h>
-#include <gal/e-table/e-table.h>
+#include <table/e-table.h>
 #include "e-completion.h"
 
 G_BEGIN_DECLS
diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c
index 5146170ccc..7c45c8e0ec 100644
--- a/widgets/text/e-completion.c
+++ b/widgets/text/e-completion.c
@@ -29,8 +29,8 @@
 
 #include <gtk/gtk.h>
 
-#include "gal/util/e-marshal.h"
-#include "gal/util/e-util.h"
+#include "e-util/e-util-marshal.h"
+#include "e-util/e-util.h"
 
 #include "e-completion.h"
 
@@ -89,7 +89,7 @@ e_completion_class_init (ECompletionClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionClass, completion_started),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER_INT_INT,
+			      e_util_marshal_NONE__POINTER_INT_INT,
 			      G_TYPE_NONE, 3,
 			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT);
 
@@ -99,7 +99,7 @@ e_completion_class_init (ECompletionClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionClass, completion_found),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER,
+			      e_util_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
@@ -109,7 +109,7 @@ e_completion_class_init (ECompletionClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ECompletionClass, completion_finished),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	object_class->dispose = e_completion_dispose;
diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c
index c5e5687396..42a24bd567 100644
--- a/widgets/text/e-entry-test.c
+++ b/widgets/text/e-entry-test.c
@@ -25,8 +25,8 @@
 
 #include <gnome.h>
 
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util-private.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util-private.h"
 
 #include "e-entry.h"
 
@@ -60,7 +60,7 @@ int main( int argc, char *argv[] )
   GtkWidget *app;
   GtkWidget *entry;
 
-  /*  bindtextdomain (PACKAGE, GAL_LOCALEDIR);
+  /*  bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
       textdomain (PACKAGE);*/
 
   gnome_init( "EEntry Test", VERSION, argc, argv);
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index 8b41d952f0..d00b2e1665 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -36,10 +36,10 @@
 #include <libxml/parser.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "widgets/misc/e-canvas.h"
+#include "widgets/misc/e-canvas-utils.h"
 
 #include "e-completion-view.h"
 #include "e-entry.h"
@@ -1200,7 +1200,7 @@ e_entry_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EEntryClass, changed),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_entry_signals[E_ENTRY_ACTIVATE] =
@@ -1209,7 +1209,7 @@ e_entry_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EEntryClass, activate),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_entry_signals[E_ENTRY_POPULATE_POPUP] =
@@ -1218,7 +1218,7 @@ e_entry_class_init (GObjectClass *object_class)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EEntryClass, populate_popup),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER_INT_OBJECT,
+			      e_util_marshal_NONE__POINTER_INT_OBJECT,
 			      G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU);
 
 	e_entry_signals[E_ENTRY_COMPLETION_POPUP] =
diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h
index 6e71364ee1..30b83c10d0 100644
--- a/widgets/text/e-entry.h
+++ b/widgets/text/e-entry.h
@@ -28,7 +28,7 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <gtk/gtktable.h>
 #include <libxml/tree.h>
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 #include "e-completion.h"
 
 G_BEGIN_DECLS
diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c
index ba71bcf002..7ecaa2f543 100644
--- a/widgets/text/e-table-text-model.c
+++ b/widgets/text/e-table-text-model.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
 
 #include "e-table-text-model.h"
 
diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h
index 46e82de1c4..3ed771996d 100644
--- a/widgets/text/e-table-text-model.h
+++ b/widgets/text/e-table-text-model.h
@@ -24,8 +24,8 @@
 #ifndef E_TABLE_TEXT_MODEL_H
 #define E_TABLE_TEXT_MODEL_H
 
-#include <gal/e-text/e-text-model.h>
-#include <gal/e-table/e-table-model.h>
+#include <text/e-text-model.h>
+#include <table/e-table-model.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
index 1fec3a182d..9d55035376 100644
--- a/widgets/text/e-text-model-test.c
+++ b/widgets/text/e-text-model-test.c
@@ -23,8 +23,8 @@
 
 #include <gnome.h>
 
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
+#include "e-util/e-util.h"
+#include "widgets/misc/e-canvas.h"
 
 #include "e-text-model.h"
 #include "e-text-model-uri.h"
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
index d919b8cc94..6736b41cde 100644
--- a/widgets/text/e-text-model-uri.c
+++ b/widgets/text/e-text-model-uri.c
@@ -30,7 +30,7 @@
 #include <gtk/gtkmain.h>
 #include <libgnome/gnome-url.h>
 
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
 
 #include "e-text-model-uri.h"
 
diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h
index 64cd7b2a57..db9a09b16f 100644
--- a/widgets/text/e-text-model-uri.h
+++ b/widgets/text/e-text-model-uri.h
@@ -24,7 +24,7 @@
 #ifndef E_TEXT_MODEL_URI_H
 #define E_TEXT_MODEL_URI_H
 
-#include <gal/e-text/e-text-model.h>
+#include <text/e-text-model.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 72562eaa49..eb7b728c19 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
 
 #include "e-text-model.h"
 #include "e-text-model-repos.h"
@@ -98,7 +98,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, changed),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_text_model_signals[E_TEXT_MODEL_REPOSITION] =
@@ -107,7 +107,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, reposition),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER_POINTER,
+			      e_util_marshal_NONE__POINTER_POINTER,
 			      G_TYPE_NONE, 2,
 			      G_TYPE_POINTER, G_TYPE_POINTER);
 
@@ -117,7 +117,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, object_activated),
 			      NULL, NULL,
-			      e_marshal_NONE__INT,
+			      e_util_marshal_NONE__INT,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_INT);
 
@@ -127,7 +127,7 @@ e_text_model_class_init (ETextModelClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextModelClass, cancel_completion),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 	
 	/* No default signal handlers. */
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
index 2c9a8c2dec..f80f361768 100644
--- a/widgets/text/e-text-test.c
+++ b/widgets/text/e-text-test.c
@@ -23,8 +23,8 @@
 
 #include <gnome.h>
 
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-unicode.h"
+#include "widgets/misc/e-canvas.h"
+#include "widgets/misc/e-unicode.h"
 
 #include "e-text.h"
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 7bafb5d58c..d1bf3eb59e 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -48,13 +48,13 @@
 #include <libart_lgpl/art_rgb.h>
 #include <libart_lgpl/art_rgb_bitmap_affine.h>
 
-#include "gal/a11y/e-text/gal-a11y-e-text.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-unicode.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-text-event-processor-emacs-like.h"
-#include "gal/util/e-util.h"
+#include "a11y/e-text/gal-a11y-e-text.h"
+#include "widgets/misc/e-canvas.h"
+#include "widgets/misc/e-canvas-utils.h"
+#include "widgets/misc/e-unicode.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-text-event-processor-emacs-like.h"
+#include "e-util/e-util.h"
 
 #include "e-text.h"
 
@@ -3413,7 +3413,7 @@ e_text_class_init (ETextClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextClass, changed),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_text_signals[E_TEXT_ACTIVATE] =
@@ -3422,7 +3422,7 @@ e_text_class_init (ETextClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextClass, activate),
 			      NULL, NULL,
-			      e_marshal_NONE__NONE,
+			      e_util_marshal_NONE__NONE,
 			      G_TYPE_NONE, 0);
 
 	e_text_signals[E_TEXT_KEYPRESS] =
@@ -3431,7 +3431,7 @@ e_text_class_init (ETextClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextClass, keypress),
 			      NULL, NULL,
-			      e_marshal_NONE__INT_INT,
+			      e_util_marshal_NONE__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
 	e_text_signals[E_TEXT_POPULATE_POPUP] =
@@ -3440,7 +3440,7 @@ e_text_class_init (ETextClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextClass, populate_popup),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER_INT_OBJECT,
+			      e_util_marshal_NONE__POINTER_INT_OBJECT,
 			      G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU);
 
 	g_object_class_install_property (gobject_class, PROP_MODEL,
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 4eb3fa830b..633db2c659 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -39,9 +39,9 @@
 
 #include <gtk/gtkmenu.h>
 
-#include <gal/util/e-text-event-processor.h>
-#include <gal/e-text/e-text-model.h>
-#include <gal/widgets/e-canvas.h>
+#include <e-util/e-text-event-processor.h>
+#include <text/e-text-model.h>
+#include <widgets/misc/e-canvas.h>
 
 G_BEGIN_DECLS