Hi, I just committed the following, which moves e-unicode-i18n.[ch] into gal so it can be more generally used. The files were moved using the standard CVS surgery method, so the history is all in tact.
Attached are the patches. Joe
Index: configure.in =================================================================== RCS file: /cvs/gnome/gal/configure.in,v retrieving revision 1.176 diff -u -r1.176 configure.in --- configure.in 2001/10/29 11:52:22 1.176 +++ configure.in 2001/10/30 04:55:28 @@ -1,6 +1,6 @@ AC_INIT(README) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gal,0.15.99.7) +AM_INIT_AUTOMAKE(gal,0.15.99.8) AM_MAINTAINER_MODE AM_ACLOCAL_INCLUDE(macros) Index: gal/util/Makefile.am =================================================================== RCS file: /cvs/gnome/gal/gal/util/Makefile.am,v retrieving revision 1.18 diff -u -r1.18 Makefile.am --- gal/util/Makefile.am 2001/10/24 04:42:11 1.18 +++ gal/util/Makefile.am 2001/10/30 04:55:29 @@ -18,6 +18,7 @@ e-sorter.c \ e-text-event-processor-emacs-like.c \ e-text-event-processor.c \ + e-unicode-i18n.c \ e-util.c \ e-xml-utils.c @@ -33,5 +34,6 @@ e-text-event-processor-emacs-like.h \ e-text-event-processor-types.h \ e-text-event-processor.h \ + e-unicode-i18n.h \ e-util.h \ e-xml-utils.h
Index: configure.in =================================================================== RCS file: /cvs/gnome/evolution/configure.in,v retrieving revision 1.409 diff -u -r1.409 configure.in --- configure.in 2001/10/29 23:44:09 1.409 +++ configure.in 2001/10/30 04:55:05 @@ -571,7 +571,7 @@ EVO_CHECK_LIB(OAF, oaf, 0.6.2) EVO_CHECK_LIB(libglade, libglade, 0.14) EVO_CHECK_LIB(gdk-pixbuf with GNOME canvas support, gnomecanvaspixbuf, 0.9.0) -EVO_CHECK_LIB(GAL, gal, 0.15.99.7) +EVO_CHECK_LIB(GAL, gal, 0.15.99.8) EVO_CHECK_LIB(GtkHTML, gtkhtml, 0.15.99.1) EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0) EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0) Index: addressbook/backend/ebook/e-card-simple.c =================================================================== RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-simple.c,v retrieving revision 1.37 diff -u -r1.37 e-card-simple.c --- addressbook/backend/ebook/e-card-simple.c 2001/10/29 14:01:57 1.37 +++ addressbook/backend/ebook/e-card-simple.c 2001/10/30 04:55:05 @@ -14,7 +14,7 @@ #include <stdlib.h> #include <string.h> #include <gtk/gtkobject.h> -#include <e-util/e-unicode-i18n.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/util/e-util.h> #include <libversit/vcc.h> Index: addressbook/gui/component/addressbook-storage.c =================================================================== RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-storage.c,v retrieving revision 1.26 diff -u -r1.26 addressbook-storage.c --- addressbook/gui/component/addressbook-storage.c 2001/10/29 12:31:45 1.26 +++ addressbook/gui/component/addressbook-storage.c 2001/10/30 04:55:06 @@ -57,11 +57,10 @@ #include <libgnome/gnome-util.h> #include <bonobo/bonobo-object.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> #include <libgnome/gnome-i18n.h> - -#include "e-util/e-unicode-i18n.h" #include "evolution-shell-component.h" Index: addressbook/gui/widgets/e-addressbook-view.c =================================================================== RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v retrieving revision 1.66 diff -u -r1.66 e-addressbook-view.c --- addressbook/gui/widgets/e-addressbook-view.c 2001/10/27 16:41:29 1.66 +++ addressbook/gui/widgets/e-addressbook-view.c 2001/10/30 04:55:06 @@ -33,6 +33,7 @@ #include <gal/widgets/e-unicode.h> #include <gal/menus/gal-view-factory-etable.h> #include <gal/menus/gal-view-etable.h> +#include <gal/util/e-unicode.i18n.h> #include <gal/unicode/gunicode.h> #include <libgnomeui/gnome-dialog-util.h> @@ -40,8 +41,6 @@ #include <libgnomeprint/gnome-print-dialog.h> #include <libgnomeprint/gnome-print-master.h> #include <libgnomeprint/gnome-print-master-preview.h> - -#include <e-util/e-unicode-i18n.h> #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" Index: calendar/gui/e-calendar-table.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v retrieving revision 1.68 diff -u -r1.68 e-calendar-table.c --- calendar/gui/e-calendar-table.c 2001/10/27 22:13:20 1.68 +++ calendar/gui/e-calendar-table.c 2001/10/30 04:55:06 @@ -37,10 +37,10 @@ #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/util/e-unicode-i18n.h> #include <gal/widgets/e-popup-menu.h> #include <widgets/misc/e-cell-date-edit.h> #include <widgets/misc/e-cell-percent.h> -#include <e-util/e-unicode-i18n.h> #include "e-calendar-table.h" #include "e-cell-date-edit-text.h" #include "calendar-config.h" Index: calendar/gui/e-itip-control.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/e-itip-control.c,v retrieving revision 1.71 diff -u -r1.71 e-itip-control.c --- calendar/gui/e-itip-control.c 2001/10/30 01:49:58 1.71 +++ calendar/gui/e-itip-control.c 2001/10/30 04:55:06 @@ -36,6 +36,7 @@ #include <libgnomeui/gnome-stock.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/widgets/e-unicode.h> #include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml-stream.h> @@ -45,7 +46,6 @@ #include <cal-client/cal-client.h> #include <e-util/e-time-utils.h> #include <e-util/e-dialog-widgets.h> -#include <e-util/e-unicode-i18n.h> #include "calendar-config.h" #include "itip-utils.h" #include "e-itip-control.h" Index: calendar/gui/e-meeting-model.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-model.c,v retrieving revision 1.13 diff -u -r1.13 e-meeting-model.c --- calendar/gui/e-meeting-model.c 2001/10/27 16:44:11 1.13 +++ calendar/gui/e-meeting-model.c 2001/10/30 04:55:06 @@ -36,13 +36,13 @@ #include <gal/e-table/e-cell-text.h> #include <gal/e-table/e-cell-popup.h> #include <gal/e-table/e-cell-combo.h> +#include <gal/util/e-unicode-i18n.h> #include <e-book.h> #include <e-card-types.h> #include <e-card-cursor.h> #include <e-card.h> #include <e-card-simple.h> #include <e-destination.h> -#include <e-util/e-unicode-i18n.h> #include <cal-util/cal-component.h> #include <cal-util/cal-util.h> #include <cal-util/timeutil.h> Index: calendar/gui/itip-utils.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v retrieving revision 1.26 diff -u -r1.26 itip-utils.c --- calendar/gui/itip-utils.c 2001/10/27 16:44:11 1.26 +++ calendar/gui/itip-utils.c 2001/10/30 04:55:06 @@ -33,8 +33,8 @@ #include <libgnome/gnome-i18n.h> #include <gtk/gtkwidget.h> #include <gal/widgets/e-gui-utils.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/util/e-util.h> -#include <e-util/e-unicode-i18n.h> #include <ical.h> #include <Evolution-Composer.h> #include <e-util/e-time-utils.h> Index: calendar/gui/print.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/print.c,v retrieving revision 1.34 diff -u -r1.34 print.c --- calendar/gui/print.c 2001/10/28 22:13:12 1.34 +++ calendar/gui/print.c 2001/10/30 04:55:06 @@ -43,7 +43,7 @@ #include <libgnomeprint/gnome-printer-dialog.h> #include <e-util/e-dialog-widgets.h> #include <e-util/e-time-utils.h> -#include <e-util/e-unicode-i18n.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/widgets/e-unicode.h> #include <cal-util/timeutil.h> #include "calendar-commands.h" Index: calendar/gui/alarm-notify/alarm-notify-dialog.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v retrieving revision 1.11 diff -u -r1.11 alarm-notify-dialog.c --- calendar/gui/alarm-notify/alarm-notify-dialog.c 2001/10/27 17:38:09 1.11 +++ calendar/gui/alarm-notify/alarm-notify-dialog.c 2001/10/30 04:55:06 @@ -32,7 +32,7 @@ #include <libgnomeui/gnome-window-icon.h> #include <glade/glade.h> #include <e-util/e-time-utils.h> -#include <e-util/e-unicode-i18n.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/widgets/e-unicode.h> #include <gal/widgets/e-scroll-frame.h> #include <gtkhtml/gtkhtml.h> Index: e-util/Makefile.am =================================================================== RCS file: /cvs/gnome/evolution/e-util/Makefile.am,v retrieving revision 1.60 diff -u -r1.60 Makefile.am --- e-util/Makefile.am 2001/10/01 19:25:06 1.60 +++ e-util/Makefile.am 2001/10/30 04:55:07 @@ -61,8 +61,6 @@ e-sexp.h \ e-time-utils.c \ e-time-utils.h \ - e-unicode-i18n.c \ - e-unicode-i18n.h \ e-url.c \ e-url.h \ md5-utils.c \ Index: filter/rule-editor.c =================================================================== RCS file: /cvs/gnome/evolution/filter/rule-editor.c,v retrieving revision 1.25 diff -u -r1.25 rule-editor.c --- filter/rule-editor.c 2001/10/29 01:40:59 1.25 +++ filter/rule-editor.c 2001/10/30 04:55:07 @@ -28,7 +28,7 @@ #include <glade/glade.h> #include <gal/widgets/e-unicode.h> -#include <e-util/e-unicode-i18n.h> +#include <gal/util/e-unicode-i18n.h> #include "rule-editor.h" #include "rule-context.h" #include "filter-rule.h" Index: mail/mail-config.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-config.c,v retrieving revision 1.184 diff -u -r1.184 mail-config.c --- mail/mail-config.c 2001/10/27 18:21:05 1.184 +++ mail/mail-config.c 2001/10/30 04:55:07 @@ -44,12 +44,12 @@ #include <shell/evolution-shell-client.h> +#include <gal/util/e-unicode-i18n.h> #include <gal/util/e-util.h> #include <gal/unicode/gunicode.h> #include <gal/widgets/e-gui-utils.h> #include <e-util/e-html-utils.h> #include <e-util/e-url.h> -#include <e-util/e-unicode-i18n.h> #include <e-util/e-passwords.h> #include "mail.h" #include "mail-config.h" Index: mail/mail-folder-cache.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-folder-cache.c,v retrieving revision 1.52 diff -u -r1.52 mail-folder-cache.c --- mail/mail-folder-cache.c 2001/10/30 03:28:40 1.52 +++ mail/mail-folder-cache.c 2001/10/30 04:55:07 @@ -36,8 +36,7 @@ #include <camel/camel-folder.h> #include <camel/camel-vtrash-folder.h> #include <camel/camel-vee-store.h> - -#include "e-util/e-unicode-i18n.h" +#include <gal/util/e-unicode-i18n.h> #include "mail-mt.h" #include "mail-folder-cache.h" Index: mail/mail-format.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-format.c,v retrieving revision 1.203 diff -u -r1.203 mail-format.c --- mail/mail-format.c 2001/10/30 02:38:26 1.203 +++ mail/mail-format.c 2001/10/30 04:55:07 @@ -42,7 +42,7 @@ #include <camel/camel-stream-null.h> #include <shell/e-setup.h> #include <e-util/e-html-utils.h> -#include <e-util/e-unicode-i18n.h> +#include <gal/util/e-unicode-i18n.h> #include "mail.h" #include "mail-tools.h" Index: mail/mail-local.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-local.c,v retrieving revision 1.106 diff -u -r1.106 mail-local.c --- mail/mail-local.c 2001/10/30 03:28:40 1.106 +++ mail/mail-local.c 2001/10/30 04:55:07 @@ -39,7 +39,7 @@ #include "gal/widgets/e-gui-utils.h" #include "e-util/e-path.h" -#include "e-util/e-unicode-i18n.h" +#include "gal/util/e-unicode-i18n.h" #include "Evolution.h" #include "evolution-storage.h" Index: mail/mail-ops.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-ops.c,v retrieving revision 1.347 diff -u -r1.347 mail-ops.c --- mail/mail-ops.c 2001/10/30 03:28:40 1.347 +++ mail/mail-ops.c 2001/10/30 04:55:07 @@ -32,6 +32,7 @@ #include <errno.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> +#include <gal/util/e-unicode-i18n.h> #include <camel/camel-mime-filter-from.h> #include <camel/camel-operation.h> #include <camel/camel-vtrash-folder.h> @@ -43,7 +44,6 @@ #include "composer/e-msg-composer.h" #include "folder-browser.h" #include "e-util/e-html-utils.h" -#include "e-util/e-unicode-i18n.h" #include "filter/filter-filter.h" Index: mail/mail-vfolder.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-vfolder.c,v retrieving revision 1.65 diff -u -r1.65 mail-vfolder.c --- mail/mail-vfolder.c 2001/10/30 03:28:40 1.65 +++ mail/mail-vfolder.c 2001/10/30 04:55:08 @@ -33,6 +33,7 @@ #include "mail-mt.h" #include "gal/widgets/e-gui-utils.h" +#include "gal/util/e-unicode-i18n.h" #include "camel/camel.h" #include "camel/camel-remote-store.h" @@ -41,8 +42,6 @@ #include "filter/vfolder-context.h" #include "filter/vfolder-editor.h" - -#include "e-util/e-unicode-i18n.h" #define d(x) Index: shell/e-local-storage.c =================================================================== RCS file: /cvs/gnome/evolution/shell/e-local-storage.c,v retrieving revision 1.59 diff -u -r1.59 e-local-storage.c --- shell/e-local-storage.c 2001/10/27 01:09:28 1.59 +++ shell/e-local-storage.c 2001/10/30 04:55:08 @@ -47,8 +47,8 @@ #include <libgnome/gnome-util.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> +#include <gal/util/e-unicode-i18n.h> #include "e-util/e-path.h" -#include "e-util/e-unicode-i18n.h" #include "e-local-folder.h" #include "evolution-storage.h" Index: shell/e-summary-storage.c =================================================================== RCS file: /cvs/gnome/evolution/shell/e-summary-storage.c,v retrieving revision 1.6 diff -u -r1.6 e-summary-storage.c --- shell/e-summary-storage.c 2001/10/27 01:09:28 1.6 +++ shell/e-summary-storage.c 2001/10/30 04:55:08 @@ -28,7 +28,7 @@ #include "e-folder.h" -#include "e-util/e-unicode-i18n.h" +#include <gal/util/e-unicode-i18n.h> #include <gal/util/e-util.h>