diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 10 | ||||
| -rw-r--r-- | composer/Makefile.am | 1 | ||||
| -rw-r--r-- | composer/e-msg-composer-address-dialog.c | 2 | ||||
| -rw-r--r-- | composer/e-msg-composer-address-entry.c | 2 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment.c | 2 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 4 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 4 |
7 files changed, 18 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index da83b8e86c..66bc828f88 100644 --- a/composer/ChangeLog +++ b/composer/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. + + * e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c, + e-msg-composer-attachment.c, e-msg-composer-hdrs.c, + e-msg-composer.c: Fixed the #include lines to deal properly with + gal. + 2000-09-12 Michael Meeks <michael@helixcode.com> * e-msg-composer.c: Update for new UI handler. diff --git a/composer/Makefile.am b/composer/Makefile.am index dd5d840058..b6a3b0760f 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -39,6 +39,7 @@ INCLUDES = \ -I$(top_builddir)/camel \ -I$(top_builddir)/addressbook/gui/component/select-names \ -I$(top_builddir)/shell \ + $(EXTRA_GNOME_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(BONOBO_GNOME_CFLAGS) \ $(GTKHTML_CFLAGS) \ diff --git a/composer/e-msg-composer-address-dialog.c b/composer/e-msg-composer-address-dialog.c index 868bafb414..1bf0dd4832 100644 --- a/composer/e-msg-composer-address-dialog.c +++ b/composer/e-msg-composer-address-dialog.c @@ -23,7 +23,7 @@ #include <gnome.h> #include "e-msg-composer-address-dialog.h" -#include <e-util/e-unicode.h> +#include <gal/widgets/e-unicode.h> enum { diff --git a/composer/e-msg-composer-address-entry.c b/composer/e-msg-composer-address-entry.c index 63b338b905..2313894144 100644 --- a/composer/e-msg-composer-address-entry.c +++ b/composer/e-msg-composer-address-entry.c @@ -26,7 +26,7 @@ cooler. */ #include <gnome.h> -#include <e-util/e-unicode.h> +#include <gal/widgets/e-unicode.h> #include "e-msg-composer-address-entry.h" diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c index ea17a9bcf3..141ad7c9ab 100644 --- a/composer/e-msg-composer-attachment.c +++ b/composer/e-msg-composer-attachment.c @@ -31,7 +31,7 @@ #include <gnome.h> #include <camel/camel.h> -#include <e-util/e-unicode.h> +#include <gal/widgets/e-unicode.h> #include "e-msg-composer-attachment.h" diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index c3e5c770cb..0ef779626e 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -36,8 +36,8 @@ #include "e-msg-composer-address-entry.h" #include "e-msg-composer-hdrs.h" -#include "widgets/e-text/e-entry.h" -#include "e-util/e-unicode.h" +#include <gal/e-text/e-entry.h> +#include <gal/widgets/e-unicode.h> #include "mail/mail-config.h" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index f58bcc3128..3ab335c807 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -49,8 +49,8 @@ #include "mail/mail-threads.h" #include "e-util/e-html-utils.h" -#include "e-util/e-gui-utils.h" -#include "widgets/misc/e-scroll-frame.h" +#include <gal/widgets/e-gui-utils.h> +#include <gal/widgets/e-scroll-frame.h> #include "e-msg-composer.h" #include "e-msg-composer-address-dialog.h" |