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

13 files changed, 105 insertions, 26 deletions

diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 2dbd2d7962..599f93a051 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,15 +1,27 @@
 eutilincludedir = $(privincludedir)/e-util
 econdincludedir = $(privincludedir)/e-conduit
 
+if OS_WIN32
+PLATFORM_SOURCES = e-win32-reloc.c
+endif
+
 INCLUDES =								\
 	-I$(top_srcdir)							\
+	-I$(top_builddir)						\
+	-DEVOLUTION_PREFIX=\""$(prefix)"\"				\
 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
 	-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\"				\
 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
 	-DEVOLUTION_PLUGINDIR=\""$(plugindir)"\"			\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
+	-DGAL_IMAGESDIR=\""$(imagesdir)"\"				\
 	-DG_LOG_DOMAIN=\"e-utils\"					\
 	$(GNOME_PILOT_CFLAGS)						\
+	$(EXTRA_GNOME_CFLAGS)                   			\
+	$(GNOME_FULL_CFLAGS)						\
+	$(GNOME_INCLUDEDIR)						\
+	$(ICONV_CFLAGS)                        				\
 	$(E_UTIL_CFLAGS)
 
 privlib_LTLIBRARIES = libeutil.la libeconduit.la
@@ -19,7 +31,6 @@ 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			\
@@ -50,7 +61,16 @@ eutilinclude_HEADERS = 				\
 	e-signature-list.h			\
 	e-time-utils.h				\
 	e-uid.h					\
-	md5-utils.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-xml-utils.h
 
 libeutil_la_SOURCES =				\
 	$(MARSHAL_GENERATED)			\
@@ -59,7 +79,6 @@ libeutil_la_SOURCES =				\
 	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			\
@@ -92,7 +111,18 @@ libeutil_la_SOURCES =				\
 	e-uid.c					\
 	eggtrayicon.c				\
 	eggtrayicon.h				\
-	md5-utils.c
+	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)
 
 MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
 @EVO_MARSHAL_RULE@
diff --git a/e-util/e-categories-master-list-wombat.h b/e-util/e-categories-master-list-wombat.h
index 024d7644e7..f11763aed5 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 <gal/widgets/e-categories-master-list-array.h>
+#include <widgets/misc/e-categories-master-list-array.h>
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 67a9a5adf8..0dcf9c91a0 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 #include "e-mktemp.h"
 
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index 227e437443..a668de948c 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gal/util/e-sorter.h>
+#include <e-util/e-sorter.h>
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 1fd74dacfe..98a1cb535e 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -24,7 +24,7 @@
 #ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
 #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
 
-#include <gal/util/e-text-event-processor.h>
+#include <e-util/e-text-event-processor.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 9a9dfb3368..733ecae11e 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "e-i18n.h"
-#include "e-marshal.h"
+#include "e-util-marshal.h"
 #include "e-text-event-processor.h"
 #include "e-util.h"
 
@@ -81,7 +81,7 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ETextEventProcessorClass, command),
 			      NULL, NULL,
-			      e_marshal_NONE__POINTER,
+			      e_util_marshal_NONE__POINTER,
 			      G_TYPE_NONE, 1,
 			      G_TYPE_POINTER);
 
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 21f2550fde..ed99b2204c 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <gtk/gtkobject.h>
-#include <gal/util/e-text-event-processor-types.h>
+#include <e-util/e-text-event-processor-types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c
index 8f05427a81..541a8cd0df 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 <gal/widgets/e-unicode.h>
+#include <widgets/misc/e-unicode.h>
 
 #ifdef __linux__
 #undef _GNU_SOURCE
@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
+#include <e-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 463afd8129..b478efb1ce 100644
--- a/e-util/e-util-marshal.list
+++ b/e-util/e-util-marshal.list
@@ -1,2 +1,52 @@
+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/e-util/e-util-private.h b/e-util/e-util-private.h
index 10a1194a9b..13066d9f36 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -32,11 +32,11 @@ const char *_gal_get_localedir (void) G_GNUC_CONST;
 const char *_gal_get_gladedir (void) G_GNUC_CONST;
 const char *_gal_get_imagesdir (void) G_GNUC_CONST;
 
-#undef GAL_LOCALEDIR
-#define GAL_LOCALEDIR _gal_get_localedir ()
+#undef EVOLUTION_LOCALEDIR
+#define EVOLUTION_LOCALEDIR _gal_get_localedir ()
 
-#undef GAL_GLADEDIR
-#define GAL_GLADEDIR _gal_get_gladedir ()
+#undef EVOLUTION_GLADEDIR
+#define EVOLUTION_GLADEDIR _gal_get_gladedir ()
 
 #undef GAL_IMAGESDIR
 #define GAL_IMAGESDIR _gal_get_imagesdir ()
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 1a4fd13fd2..28f2596583 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -346,8 +346,7 @@ e_read_uri(const char *uri)
 
 /* Include build marshalers */
 
-#include "e-marshal.h"
-#include "e-marshal.c"
+#include "e-util-marshal.h"
 
 gchar**
 e_strsplit (const gchar *string,
@@ -1232,7 +1231,7 @@ e_gettext (const char *msgid)
 	static gboolean initialized = FALSE;
 
 	if (!initialized) {
-		bindtextdomain (E_I18N_DOMAIN, GAL_LOCALEDIR);
+		bindtextdomain (E_I18N_DOMAIN, EVOLUTION_LOCALEDIR);
 		bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8");
 		initialized = TRUE;
 	}        
diff --git a/e-util/e-util.h b/e-util/e-util.h
index d9d51967d1..6fe75746c2 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -33,7 +33,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <gal/util/e-marshal.h>
+#include <e-util/e-util-marshal.h>
 
 #define E_MAKE_TYPE(l,str,t,ci,i,parent) \
 GType l##_get_type(void)\
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 20db453381..d737001ce1 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -65,10 +65,10 @@ replace_prefix (const char *runtime_prefix,
                 const char *configure_time_path)
 {
         if (runtime_prefix &&
-            strncmp (configure_time_path, GAL_PREFIX "/",
-                     strlen (GAL_PREFIX) + 1) == 0) {
+            strncmp (configure_time_path, EVOLUTION_PREFIX "/",
+                     strlen (EVOLUTION_PREFIX) + 1) == 0) {
                 return g_strconcat (runtime_prefix,
-                                    configure_time_path + strlen (GAL_PREFIX),
+                                    configure_time_path + strlen (EVOLUTION_PREFIX),
                                     NULL);
         } else
                 return g_strdup (configure_time_path);
@@ -88,10 +88,10 @@ setup (void)
 
         gnome_win32_get_prefixes (hmodule, &full_prefix, &cp_prefix);
 
-        localedir = replace_prefix (cp_prefix, GAL_LOCALEDIR);
+        localedir = replace_prefix (cp_prefix, EVOLUTION_LOCALEDIR);
         g_free (cp_prefix);
 
-        gladedir = replace_prefix (full_prefix, GAL_GLADEDIR);
+        gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR);
         imagesdir = replace_prefix (full_prefix, GAL_IMAGESDIR);
         g_free (full_prefix);