aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-autofilter.c4
-rw-r--r--mail/mail-crypto.c2
-rw-r--r--mail/mail-search-dialogue.c1
-rw-r--r--mail/main.c4
-rw-r--r--mail/message-thread.c1
6 files changed, 15 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ef34f2f319..6340d44bfa 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-06 Kjartan Maraas <kmaraas@gnome.org>
+
+ * mail-autofilter.c: Fix up #include <config.h>
+ * mail-crypto.c: Same here.
+ * mail-search-dialog.c: Here too.
+ * main.c: Fix indentation of #ifdef
+ * message-thread.c: Fix include.
+
2000-11-06 Jeffrey Stedfast <fejj@helixcode.com>
* mail-callbacks.c (delete_msg): Don't invert the flag.
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 7e54a9a611..d4b537ab31 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -25,11 +25,11 @@
/* Code for autogenerating rules or filters from a message. */
-#include <ctype.h>
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <ctype.h>
+
#include <bonobo.h>
#include <libgnomeui/gnome-app.h>
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 00428a5b29..c99b30ba3b 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -32,7 +32,7 @@
*
*/
-#include "config.h"
+#include <config.h>
#ifdef PGP_PROGRAM
#include <stdlib.h>
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
index b336ac753e..63abfc4efa 100644
--- a/mail/mail-search-dialogue.c
+++ b/mail/mail-search-dialogue.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <config.h>
#include <gtk/gtk.h>
#include <gnome.h>
diff --git a/mail/main.c b/mail/main.c
index a6bc2fd829..a8b5e1298a 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -53,10 +53,10 @@ main (int argc, char *argv [])
mcheck(blowup);
#endif
#endif
- #ifdef ENABLE_NLS
+#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
textdomain (PACKAGE);
- #endif
+#endif
g_thread_init( NULL );
diff --git a/mail/message-thread.c b/mail/message-thread.c
index ce05f5e89a..098803e28e 100644
--- a/mail/message-thread.c
+++ b/mail/message-thread.c
@@ -20,6 +20,7 @@
* USA
*/
+#include <config.h>
#include "camel/camel.h"
#include <sys/types.h>
#include <unistd.h>