aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog2
-rw-r--r--mail/Makefile.am8
-rw-r--r--mail/mail-session.c2
3 files changed, 5 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a917121f0e..6b89aac7f4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,7 @@
2001-05-22 Jeffrey Stedfast <fejj@ximian.com>
+ * Makefile.am: Use MAILER_CFLAGS and MAILER_LIBS.
+
* message-browser.c (message_browser_folder_loaded): Instead of
calling message_list_select_uid() here, instead connect to the
"message_list_loaded" signal since the message-list is not built
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 7940fa7484..ce4e10d621 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -21,11 +21,7 @@ INCLUDES = \
-I$(top_srcdir)/executive-summary \
-I$(top_srcdir)/shell/importer \
-I$(top_builddir)/shell/importer \
- $(EXTRA_GNOME_CFLAGS) \
- $(BONOBO_HTML_GNOME_CFLAGS) \
- $(GNOME_VFS_CFLAGS) \
- $(GTKHTML_CFLAGS) \
- $(THREADS_CFLAGS) \
+ $(MAILER_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
@@ -118,7 +114,7 @@ evolution_mail_LDADD = \
$(top_builddir)/executive-summary/evolution-services/libevolution-services.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(top_builddir)/widgets/menus/libmenus.la \
- $(BONOBO_HTML_GNOME_LIBS)
+ $(MAILER_LIBS)
evolution_mail_LDFLAGS = \
-export-dynamic
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 1c45375b79..88a69f8097 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -188,7 +188,7 @@ alert_user (CamelSession *session, CamelSessionAlertType type,
const char *prompt, gboolean cancel)
{
MailSession *mail_session = MAIL_SESSION (session);
- const char *message_type;
+ const char *message_type = NULL;
if (!mail_session->interaction_enabled)
return FALSE;