diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/Makefile.am | 5 | ||||
| -rw-r--r-- | mail/component-factory.c | 2 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 4 | ||||
| -rw-r--r-- | mail/folder-browser.c | 6 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-config-gui.c | 2 | ||||
| -rw-r--r-- | mail/mail-display.c | 4 | ||||
| -rw-r--r-- | mail/mail-display.h | 2 | ||||
| -rw-r--r-- | mail/main.c | 6 | ||||
| -rw-r--r-- | mail/message-list.c | 10 | ||||
| -rw-r--r-- | mail/message-list.h | 14 |
12 files changed, 38 insertions, 29 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index adf62d1e0d..e2d93839e2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2000-09-18 Christopher James Lahey <clahey@helixcode.com> + + * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and + $(EXTRA_GNOME_LIBS). Removed unneeded libraries. + + * component-factory.c, folder-browser-factory.c, folder-browser.c, + mail-callbacks.c, mail-config-gui.c, mail-display.c, + mail-display.h, main.c, message-list.c, message-list.h: Fixed the + #include lines to deal properly with gal. + 2000-09-16 Michael Meeks <michael@helixcode.com> * Makefile.am (INCLUDES): add datadir diff --git a/mail/Makefile.am b/mail/Makefile.am index d7a8518e9d..3e198c1d9e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -I$(top_srcdir)/camel \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ + $(EXTRA_GNOME_CFLAGS) \ $(BONOBO_HTML_GNOME_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ $(UNICODE_CFLAGS) \ @@ -82,16 +83,14 @@ evolution_mail_SOURCES = \ evolution_mail_LDADD = \ $(top_builddir)/shell/libeshell.a \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/e-paned/libepaned.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/widgets/e-table/libetable.a \ - $(top_builddir)/widgets/e-text/libetext.a \ $(CAMEL_OBJS_EXTRA) \ $(top_builddir)/camel/libcamel.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libibex/libibex.la \ $(top_builddir)/filter/libfilter.la \ $(BONOBO_VFS_GNOME_LIBS) \ + $(EXTRA_GNOME_LIBS) \ $(GTKHTML_LIBS) \ $(THREADS_LIBS) \ $(UNICODE_LIBS) diff --git a/mail/component-factory.c b/mail/component-factory.c index 30c58d602d..0e745414e9 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -38,7 +38,7 @@ #include "mail.h" /* YUCK FIXME */ #include "mail-tools.h" #include "mail-ops.h" -#include "e-util/e-gui-utils.h" +#include <gal/widgets/e-gui-utils.h> #include "mail-local-storage.h" #include "component-factory.h" diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 56a7f4952d..39c774f7e1 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -17,8 +17,8 @@ #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-ui-component.h> -#include "e-util/e-util.h" -#include "e-util/e-gui-utils.h" +#include <gal/util/e-util.h> +#include <gal/widgets/e-gui-utils.h> #include "folder-browser-factory.h" diff --git a/mail/folder-browser.c b/mail/folder-browser.c index c3e4db16f0..2e461ed3ea 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -10,16 +10,16 @@ #include <config.h> #include <ctype.h> #include <gnome.h> -#include "e-util/e-util.h" #include "e-util/e-sexp.h" -#include "e-util/e-unicode.h" #include "folder-browser.h" #include "mail.h" #include "mail-tools.h" #include "message-list.h" #include "mail-threads.h" #include "mail-ops.h" -#include <widgets/e-paned/e-vpaned.h> +#include <gal/util/e-util.h> +#include <gal/widgets/e-unicode.h> +#include <gal/e-paned/e-vpaned.h> #include "mail-vfolder.h" #include "filter/vfolder-rule.h" diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 748127ce4c..59cf1b3f0b 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -39,7 +39,7 @@ #include "folder-browser.h" #include "filter/filter-editor.h" #include "filter/filter-driver.h" -#include "widgets/e-table/e-table.h" +#include <gal/e-table/e-table.h> /* FIXME: is there another way to do this? */ #include "Evolution.h" diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c index 70a3f0326b..345300949c 100644 --- a/mail/mail-config-gui.c +++ b/mail/mail-config-gui.c @@ -33,7 +33,7 @@ #include <glade/glade.h> #include "e-util/e-html-utils.h" -#include "e-util/e-unicode.h" +#include <gal/widgets/e-unicode.h> #include "mail.h" #include "mail-threads.h" #include "mail-tools.h" diff --git a/mail/mail-display.c b/mail/mail-display.c index 446ef63297..bc864b0aca 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -14,9 +14,9 @@ #include <fcntl.h> #include <errno.h> #include <gnome.h> -#include "e-util/e-util.h" #include "e-util/e-html-utils.h" -#include "e-util/e-popup-menu.h" +#include <gal/util/e-util.h> +#include <gal/widgets/e-popup-menu.h> #include "mail-display.h" #include "mail.h" diff --git a/mail/mail-display.h b/mail/mail-display.h index 838921848d..f18ef68cba 100644 --- a/mail/mail-display.h +++ b/mail/mail-display.h @@ -6,7 +6,7 @@ #include <gtk/gtkvbox.h> #include <gtkhtml/gtkhtml.h> -#include "widgets/misc/e-scroll-frame.h" +#include <gal/widgets/e-scroll-frame.h> #include "camel/camel-stream.h" #include "camel/camel-mime-message.h" diff --git a/mail/main.c b/mail/main.c index cd9c6e7d6e..7107340100 100644 --- a/mail/main.c +++ b/mail/main.c @@ -21,9 +21,9 @@ #include <gconf/gconf.h> #endif -#include "e-util/e-gui-utils.h" -#include "e-util/e-cursors.h" -#include "e-util/e-unicode.h" +#include <gal/widgets/e-gui-utils.h> +#include <gal/widgets/e-cursors.h> +#include <gal/widgets/e-unicode.h> #include "component-factory.h" #include "mail.h" diff --git a/mail/message-list.c b/mail/message-list.c index 414e419c6e..187dbe9881 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -13,9 +13,6 @@ #include <config.h> #include <gnome.h> #include <bonobo/bonobo-main.h> -#include <e-util/e-util.h> -#include <e-util/e-gui-utils.h> -#include <e-util/e-popup-menu.h> #include <camel/camel-exception.h> #include <camel/camel-folder.h> @@ -32,8 +29,11 @@ #include "Mail.h" -#include "widgets/e-table/e-table-header-item.h" -#include "widgets/e-table/e-table-item.h" +#include <gal/util/e-util.h> +#include <gal/widgets/e-gui-utils.h> +#include <gal/widgets/e-popup-menu.h> +#include <gal/e-table/e-table-header-item.h> +#include <gal/e-table/e-table-item.h> #include "art/mail-new.xpm" #include "art/mail-read.xpm" diff --git a/mail/message-list.h b/mail/message-list.h index d4a0e5e6b2..d6392ed3f9 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -7,13 +7,13 @@ #include <bonobo/bonobo-main.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-ui-handler.h> -#include "e-table/e-table-scrolled.h" -#include "e-table/e-table-simple.h" -#include "e-table/e-tree-simple.h" -#include "e-table/e-cell-text.h" -#include "e-table/e-cell-toggle.h" -#include "e-table/e-cell-checkbox.h" -#include "e-table/e-cell-tree.h" +#include <gal/e-table/e-table-scrolled.h> +#include <gal/e-table/e-table-simple.h> +#include <gal/e-table/e-tree-simple.h> +#include <gal/e-table/e-cell-text.h> +#include <gal/e-table/e-cell-toggle.h> +#include <gal/e-table/e-cell-checkbox.h> +#include <gal/e-table/e-cell-tree.h> #include "folder-browser.h" |