From d6d55273d47b60e00f63a79ba37ebc730a19c6f5 Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Tue, 30 Oct 2001 05:02:49 +0000 Subject: Require gal 0.15.99.8 2001-10-29 Joe Shaw * configure.in: Require gal 0.15.99.8 * addressbook/backend/ebook/e-card-simple.c, addressbook/gui/component/addressbook-storage.c, addressbook/gui/widgets/e-addressbook-view.c, calendar/gui/e-calendar-table.c, calendar/gui/e-itip-control.c, calendar/gui/e-meeting-model.c, calendar/gui/itip-utils.c, calendar/gui/print.c, calendar/gui/alarm-notify/alarm-notify-dialog.c, filter/rule-editor.c, mail/mail-config.c, mail/mail-folder-cache.c, mail/mail-format.c, mail/mail-local.c, mail/mail-ops.c, mail/mail-vfolder.c, shell/e-local-storage.c, shell/e-summary-storage.c: Change includes of e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h svn path=/trunk/; revision=14427 --- ChangeLog | 26 +++++++++++++++++++++++++ addressbook/backend/ebook/e-card-simple.c | 2 +- addressbook/gui/component/addressbook-storage.c | 3 +-- addressbook/gui/widgets/e-addressbook-view.c | 3 +-- calendar/gui/alarm-notify/alarm-notify-dialog.c | 2 +- calendar/gui/e-calendar-table.c | 2 +- calendar/gui/e-itip-control.c | 2 +- calendar/gui/e-meeting-model.c | 2 +- calendar/gui/itip-utils.c | 2 +- calendar/gui/print.c | 2 +- configure.in | 2 +- e-util/Makefile.am | 2 -- filter/rule-editor.c | 2 +- mail/mail-config.c | 2 +- mail/mail-folder-cache.c | 3 +-- mail/mail-format.c | 2 +- mail/mail-local.c | 2 +- mail/mail-ops.c | 2 +- mail/mail-vfolder.c | 3 +-- shell/e-local-storage.c | 2 +- shell/e-summary-storage.c | 2 +- 21 files changed, 45 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07795e0634..a01a29993a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2001-10-29 Joe Shaw + + * configure.in: Require gal 0.15.99.8 + + * addressbook/backend/ebook/e-card-simple.c, + addressbook/gui/component/addressbook-storage.c, + addressbook/gui/widgets/e-addressbook-view.c, + calendar/gui/e-calendar-table.c, + calendar/gui/e-itip-control.c, + calendar/gui/e-meeting-model.c, + calendar/gui/itip-utils.c, + calendar/gui/print.c, + calendar/gui/alarm-notify/alarm-notify-dialog.c, + filter/rule-editor.c, + mail/mail-config.c, + mail/mail-folder-cache.c, + mail/mail-format.c, + mail/mail-local.c, + mail/mail-ops.c, + mail/mail-vfolder.c, + shell/e-local-storage.c, + shell/e-summary-storage.c: Change includes of + e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h + + * e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore. + 2001-10-29 Christopher James Lahey * NEWS (Addressbook): Added my addressbook changes. diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c index c7b58f275d..b1f54ffd03 100644 --- a/addressbook/backend/ebook/e-card-simple.c +++ b/addressbook/backend/ebook/e-card-simple.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 647c21ef52..8f22ac359a 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -57,12 +57,11 @@ #include #include +#include #include #include #include -#include "e-util/e-unicode-i18n.h" - #include "evolution-shell-component.h" #include "addressbook-config.h" diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index d742b9fe4f..15e6dc7a64 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -41,8 +42,6 @@ #include #include -#include - #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 89ede6f1b1..2ad6783cf9 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 3dd04df9c2..545a5a146f 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -37,10 +37,10 @@ #include #include #include +#include #include #include #include -#include #include "e-calendar-table.h" #include "e-cell-date-edit-text.h" #include "calendar-config.h" diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index f0e89d6eec..33807fa994 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include "calendar-config.h" #include "itip-utils.h" #include "e-itip-control.h" diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 232077a8aa..c9555a6f9b 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -36,13 +36,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 16d778fbf3..e6be9ccef7 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -33,8 +33,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 253c23c0c0..20c1d00fd3 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include "calendar-commands.h" diff --git a/configure.in b/configure.in index 315cbcccf0..3ab3320f37 100644 --- a/configure.in +++ b/configure.in @@ -571,7 +571,7 @@ EVO_CHECK_LIB(Bonobo, bonobox, 1.0.3) 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) diff --git a/e-util/Makefile.am b/e-util/Makefile.am index f0dbca7500..4e6199b3d1 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -61,8 +61,6 @@ libeutil_la_SOURCES = \ 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 \ diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 1c705a5e15..9bb90c2b89 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "rule-editor.h" #include "rule-context.h" #include "filter-rule.h" diff --git a/mail/mail-config.c b/mail/mail-config.c index 6efa7f38da..c2a0472530 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -44,12 +44,12 @@ #include +#include #include #include #include #include #include -#include #include #include "mail.h" #include "mail-config.h" diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index ffbc210e82..7cf21ca1da 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -36,8 +36,7 @@ #include #include #include - -#include "e-util/e-unicode-i18n.h" +#include #include "mail-mt.h" #include "mail-folder-cache.h" diff --git a/mail/mail-format.c b/mail/mail-format.c index a5f21c71db..22831b77ba 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "mail.h" #include "mail-tools.h" diff --git a/mail/mail-local.c b/mail/mail-local.c index 74a7c3fbe9..9267878757 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -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" diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 201e8a5e13..54bc2dbbf8 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -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" diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index ca695f8ae6..c6e0dbac2b 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -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" @@ -42,8 +43,6 @@ #include "filter/vfolder-context.h" #include "filter/vfolder-editor.h" -#include "e-util/e-unicode-i18n.h" - #define d(x) static VfolderContext *context; /* context remains open all time */ diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index f2e8a671b9..97a26b5634 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -47,8 +47,8 @@ #include #include #include +#include #include "e-util/e-path.h" -#include "e-util/e-unicode-i18n.h" #include "e-local-folder.h" #include "evolution-storage.h" diff --git a/shell/e-summary-storage.c b/shell/e-summary-storage.c index 1938529c38..19266fa419 100644 --- a/shell/e-summary-storage.c +++ b/shell/e-summary-storage.c @@ -28,7 +28,7 @@ #include "e-folder.h" -#include "e-util/e-unicode-i18n.h" +#include #include -- cgit