balsa r8085 - in trunk: . libbalsa libinit_balsa src



Author: PeterB
Date: Thu Feb 26 04:58:24 2009
New Revision: 8085
URL: http://svn.gnome.org/viewvc/balsa?rev=8085&view=rev

Log:
pass and test for HAVE_CONFIG_H

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libbalsa/Makefile.am
   trunk/libbalsa/abook-completion.c
   trunk/libbalsa/address-book-extern.c
   trunk/libbalsa/address-book-gpe.c
   trunk/libbalsa/address-book-ldap.c
   trunk/libbalsa/address-book-ldif.c
   trunk/libbalsa/address-book-rubrica.c
   trunk/libbalsa/address-book-text.c
   trunk/libbalsa/address-book-vcard.c
   trunk/libbalsa/address-book.c
   trunk/libbalsa/address-view.c
   trunk/libbalsa/address.c
   trunk/libbalsa/body.c
   trunk/libbalsa/body.h
   trunk/libbalsa/cell-renderer-button.c
   trunk/libbalsa/files.c
   trunk/libbalsa/files.h
   trunk/libbalsa/filter-error.c
   trunk/libbalsa/filter-file.c
   trunk/libbalsa/filter-funcs.c
   trunk/libbalsa/filter.c
   trunk/libbalsa/folder-scanners.c
   trunk/libbalsa/folder-scanners.h
   trunk/libbalsa/gmime-gpgme-context.c
   trunk/libbalsa/gmime-part-rfc2440.c
   trunk/libbalsa/gmime-stream-gio.c
   trunk/libbalsa/gmime-stream-gio.h
   trunk/libbalsa/gmime-stream-gnome-vfs.c
   trunk/libbalsa/gmime-stream-gnome-vfs.h
   trunk/libbalsa/html.c
   trunk/libbalsa/html.h
   trunk/libbalsa/identity.c
   trunk/libbalsa/identity.h
   trunk/libbalsa/imap-server.c
   trunk/libbalsa/imap-server.h
   trunk/libbalsa/information.c
   trunk/libbalsa/libbalsa-conf.h
   trunk/libbalsa/libbalsa-vfs.c
   trunk/libbalsa/libbalsa-vfs.h
   trunk/libbalsa/libbalsa.c
   trunk/libbalsa/libbalsa.h
   trunk/libbalsa/mailbox-filter.c
   trunk/libbalsa/mailbox.c
   trunk/libbalsa/mailbox.h
   trunk/libbalsa/mailbox_imap.c
   trunk/libbalsa/mailbox_local.c
   trunk/libbalsa/mailbox_local.h
   trunk/libbalsa/mailbox_maildir.c
   trunk/libbalsa/mailbox_mbox.c
   trunk/libbalsa/mailbox_mh.c
   trunk/libbalsa/mailbox_pop3.c
   trunk/libbalsa/mailbox_remote.c
   trunk/libbalsa/message.c
   trunk/libbalsa/message.h
   trunk/libbalsa/mime-stream-shared.c
   trunk/libbalsa/mime-stream-shared.h
   trunk/libbalsa/mime.c
   trunk/libbalsa/misc.c
   trunk/libbalsa/missing_time.c
   trunk/libbalsa/rfc2445.c
   trunk/libbalsa/rfc3156.c
   trunk/libbalsa/rfc3156.h
   trunk/libbalsa/send.c
   trunk/libbalsa/send.h
   trunk/libbalsa/server.c
   trunk/libbalsa/smtp-server.c
   trunk/libbalsa/smtp-server.h
   trunk/libbalsa/source-viewer.c
   trunk/libinit_balsa/assistant_helper.c
   trunk/libinit_balsa/assistant_helper.h
   trunk/libinit_balsa/assistant_init.h
   trunk/libinit_balsa/assistant_page_defclient.h
   trunk/libinit_balsa/assistant_page_directory.c
   trunk/libinit_balsa/assistant_page_directory.h
   trunk/libinit_balsa/assistant_page_finish.c
   trunk/libinit_balsa/assistant_page_finish.h
   trunk/libinit_balsa/assistant_page_user.c
   trunk/libinit_balsa/assistant_page_user.h
   trunk/libinit_balsa/assistant_page_welcome.h
   trunk/libinit_balsa/balsa-druid-page-defclient.h
   trunk/libinit_balsa/balsa-druid-page-directory.h
   trunk/libinit_balsa/balsa-druid-page-finish.c
   trunk/libinit_balsa/balsa-druid-page-finish.h
   trunk/libinit_balsa/balsa-druid-page-user.c
   trunk/libinit_balsa/balsa-druid-page-user.h
   trunk/libinit_balsa/balsa-druid-page-welcome.h
   trunk/libinit_balsa/balsa-initdruid.h
   trunk/libinit_balsa/helper.c
   trunk/libinit_balsa/helper.h
   trunk/libinit_balsa/init_balsa.c
   trunk/src/Makefile.am
   trunk/src/ab-main.c
   trunk/src/ab-window.c
   trunk/src/ab-window.h
   trunk/src/address-book-config.c
   trunk/src/balsa-app.c
   trunk/src/balsa-bonobo.c
   trunk/src/balsa-bonobo.h
   trunk/src/balsa-icons.c
   trunk/src/balsa-icons.h
   trunk/src/balsa-index.c
   trunk/src/balsa-mblist.c
   trunk/src/balsa-message.c
   trunk/src/balsa-message.h
   trunk/src/balsa-mime-widget-callbacks.c
   trunk/src/balsa-mime-widget-callbacks.h
   trunk/src/balsa-mime-widget-crypto.c
   trunk/src/balsa-mime-widget-crypto.h
   trunk/src/balsa-mime-widget-image.c
   trunk/src/balsa-mime-widget-message.c
   trunk/src/balsa-mime-widget-multipart.c
   trunk/src/balsa-mime-widget-text.c
   trunk/src/balsa-mime-widget-vcalendar.c
   trunk/src/balsa-mime-widget.c
   trunk/src/balsa-print-object-default.c
   trunk/src/balsa-print-object-header.c
   trunk/src/balsa-print-object-header.h
   trunk/src/balsa-print-object-text.c
   trunk/src/balsa-print-object.c
   trunk/src/balsa-print-object.h
   trunk/src/filter-edit-callbacks.c
   trunk/src/filter-edit-dialog.c
   trunk/src/filter-export-callbacks.c
   trunk/src/filter-export-dialog.c
   trunk/src/filter-run-callbacks.c
   trunk/src/filter-run-dialog.c
   trunk/src/folder-conf.c
   trunk/src/information-dialog.c
   trunk/src/information-dialog.h
   trunk/src/mailbox-conf.c
   trunk/src/mailbox-node.c
   trunk/src/main-window.c
   trunk/src/main.c
   trunk/src/message-window.c
   trunk/src/pref-manager.c
   trunk/src/pref-manager.h
   trunk/src/print-gtk.c
   trunk/src/print.c
   trunk/src/print.h
   trunk/src/quote-color.c
   trunk/src/quote-color.h
   trunk/src/save-restore.c
   trunk/src/save-restore.h
   trunk/src/sendmsg-window.c
   trunk/src/sendmsg-window.h
   trunk/src/spell-check.c
   trunk/src/spell-check.h
   trunk/src/store-address.c
   trunk/src/store-address.h
   trunk/src/toolbar-factory.c
   trunk/src/toolbar-factory.h
   trunk/src/toolbar-prefs.c
   trunk/src/toolbar-prefs.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,7 @@
 AM_INIT_AUTOMAKE(balsa, "$BALSA_MAJOR.$BALSA_REVISION.${BALSA_PATCHLEVEL}")
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AC_DEFINE_UNQUOTED(BALSA_MAJOR, $BALSA_MAJOR,
                    [Define to the Balsa major version])
@@ -858,8 +858,7 @@
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	for option in -Wsign-compare -Wpointer-arith -Wnested-externs \
             -Wchar-subscripts -Wuninitialized -Wmissing-prototypes    \
-            -Wreturn-type -Wdeclaration-after-statement               \
-            -D_FORTIFY_SOURCE=2 ; do
+            -Wreturn-type -Wdeclaration-after-statement ; do
                 SAVE_CFLAGS="$CFLAGS"
                 CFLAGS="$CFLAGS $option"
                 AC_MSG_CHECKING([whether gcc understands $option])
@@ -891,7 +890,8 @@
 -DGNOME_DISABLE_DEPRECATED_SOURCE \
 -DGNOME_VFS_DISABLE_DEPRECATED \
 -DGTK_DISABLE_DEPRECATED \
--DPANGO_DISABLE_DEPRECATED"
+-DPANGO_DISABLE_DEPRECATED \
+-D_FORTIFY_SOURCE=2"
 else
 	BALSA_FROM_SVN=no
 fi

Modified: trunk/libbalsa/Makefile.am
==============================================================================
--- trunk/libbalsa/Makefile.am	(original)
+++ trunk/libbalsa/Makefile.am	Thu Feb 26 04:58:24 2009
@@ -147,11 +147,11 @@
 	${libbalsa_gpgme_extra_dist}	\
 	${libbalsa_smime_extra_dist}
 
-INCLUDES= -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libbalsa \
+AM_CPPFLAGS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libbalsa \
 	-I${top_srcdir}/libbalsa/imap \
-	$(BALSA_CFLAGS)
+	$(BALSA_DEFS)
 
-DEFS = $(BALSA_DEFS)
+AM_CFLAGS = $(BALSA_CFLAGS)
 
 #Signal marshallers
 marshal_prefix = libbalsa

Modified: trunk/libbalsa/abook-completion.c
==============================================================================
--- trunk/libbalsa/abook-completion.c	(original)
+++ trunk/libbalsa/abook-completion.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2001 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,11 +20,13 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "abook-completion.h"
 
 #include <string.h>
 
-#include "abook-completion.h"
 #include "information.h"
 #include "misc.h"
 

Modified: trunk/libbalsa/address-book-extern.c
==============================================================================
--- trunk/libbalsa/address-book-extern.c	(original)
+++ trunk/libbalsa/address-book-extern.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,16 +38,17 @@
   ...
 */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #define _POSIX_C_SOURCE 2
+#include "address-book-extern.h"
 
 #include <stdio.h>
 #include <sys/stat.h>
 
 #include "address-book.h"
 #include "libbalsa-conf.h"
-#include "address-book-extern.h"
 #include "information.h"
 #include "abook-completion.h"
 #include <glib/gi18n.h>

Modified: trunk/libbalsa/address-book-gpe.c
==============================================================================
--- trunk/libbalsa/address-book-gpe.c	(original)
+++ trunk/libbalsa/address-book-gpe.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2003 Stuart Parmenter and others,
+ * Copyright (C) 1997-2000 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,10 +27,14 @@
  http://cvs.handhelds.org/cgi-bin/viewcvs.cgi/gpe/base/gpe-contacts
  Tags must be UPPERCASE.
  */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #if defined(HAVE_SQLITE)
 
+#include "address-book-gpe.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,7 +43,6 @@
 #include <time.h>
 
 #include "address-book.h"
-#include "address-book-gpe.h"
 #include "information.h"
 
 #define ASSURE_GPE_DIR\

Modified: trunk/libbalsa/address-book-ldap.c
==============================================================================
--- trunk/libbalsa/address-book-ldap.c	(original)
+++ trunk/libbalsa/address-book-ldap.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2003 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,10 +32,14 @@
  * organizationalPerson type. We are lenient.
  *
  */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #if ENABLE_LDAP
 
+#include "address-book-ldap.h"
+
 #include <glib.h>
 #include <gnome.h>
 #include <sys/time.h>
@@ -49,7 +53,6 @@
 #endif
 
 #include "address-book.h"
-#include "address-book-ldap.h"
 #include "information.h"
 #include "libbalsa-conf.h"
 #include <glib/gi18n.h>

Modified: trunk/libbalsa/address-book-ldif.c
==============================================================================
--- trunk/libbalsa/address-book-ldif.c	(original)
+++ trunk/libbalsa/address-book-ldif.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2005 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,12 +24,14 @@
  * An LDIF addressbook. See rfc-2849 for format.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-book-ldif.h"
 
 #include <ctype.h>
 #include <string.h>
 
-#include "address-book-ldif.h"
 #include <glib/gi18n.h>
 
 static void

Modified: trunk/libbalsa/address-book-rubrica.c
==============================================================================
--- trunk/libbalsa/address-book-rubrica.c	(original)
+++ trunk/libbalsa/address-book-rubrica.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2005 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * Rubrica2 address book support was written by Copyright (C)
@@ -27,7 +27,10 @@
  * A Rubrica (XML) addressbook.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-book-rubrica.h"
 
 #if HAVE_RUBRICA
 
@@ -40,7 +43,6 @@
 #include "libbalsa-conf.h"
 #include "abook-completion.h"
 #include "misc.h"
-#include "address-book-rubrica.h"
 #include <glib/gi18n.h>
 
 

Modified: trunk/libbalsa/address-book-text.c
==============================================================================
--- trunk/libbalsa/address-book-text.c	(original)
+++ trunk/libbalsa/address-book-text.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2005 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,12 +27,14 @@
  * books ...
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-book-text.h"
 
 #include <sys/stat.h>
 #include <string.h>
 
-#include "address-book-text.h"
 #include "abook-completion.h"
 #include "libbalsa-conf.h"
 #include "misc.h"

Modified: trunk/libbalsa/address-book-vcard.c
==============================================================================
--- trunk/libbalsa/address-book-vcard.c	(original)
+++ trunk/libbalsa/address-book-vcard.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2005 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,10 +28,12 @@
  * Obviously, the best method would be to have file encoded in UTF-8.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-book-vcard.h"
 
 #include <string.h>
-#include "address-book-vcard.h"
 #include <glib/gi18n.h>
 
 /* FIXME: Perhaps the whole thing could be rewritten to use a g_scanner ?? */

Modified: trunk/libbalsa/address-book.c
==============================================================================
--- trunk/libbalsa/address-book.c	(original)
+++ trunk/libbalsa/address-book.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2005 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,15 +20,16 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-book.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
-#include "address-book.h"
 #include "libbalsa-marshal.h"
-
 #include "libbalsa-conf.h"
-#include <glib/gi18n.h>
 
 static GObjectClass *parent_class = NULL;
 

Modified: trunk/libbalsa/address-view.c
==============================================================================
--- trunk/libbalsa/address-view.c	(original)
+++ trunk/libbalsa/address-view.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2007 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,11 @@
  */
 
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-view.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
@@ -35,7 +39,6 @@
 /*
  * LibBalsa includes.
  */
-#include "address-view.h"
 #include "address-book.h"
 #include "cell-renderer-button.h"
 #include "misc.h"

Modified: trunk/libbalsa/address.c
==============================================================================
--- trunk/libbalsa/address.c	(original)
+++ trunk/libbalsa/address.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,12 +20,14 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address.h"
 
 #include <string.h>
 #include <gmime/gmime.h>
 
-#include "address.h"
 #include "misc.h"
 #include <glib/gi18n.h>
 

Modified: trunk/libbalsa/body.c
==============================================================================
--- trunk/libbalsa/body.c	(original)
+++ trunk/libbalsa/body.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: trunk/libbalsa/body.h
==============================================================================
--- trunk/libbalsa/body.h	(original)
+++ trunk/libbalsa/body.h	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2000 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,6 @@
 #include <gdk/gdk.h>
 
 #include "libbalsa-vfs.h"
-#include "config.h"
 
 #ifdef HAVE_GPGME
 #include "gmime-gpgme-signature.h"

Modified: trunk/libbalsa/cell-renderer-button.c
==============================================================================
--- trunk/libbalsa/cell-renderer-button.c	(original)
+++ trunk/libbalsa/cell-renderer-button.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2007 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,13 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <gtk/gtk.h>
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "cell-renderer-button.h"
 
+#include <gtk/gtk.h>
+
 enum {
     ACTIVATED,
     LAST_SIGNAL

Modified: trunk/libbalsa/files.c
==============================================================================
--- trunk/libbalsa/files.c	(original)
+++ trunk/libbalsa/files.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "files.h"
+
 #include <ctype.h>
 #include <string.h>
 
@@ -38,7 +42,6 @@
 
 #include "misc.h"
 #include "libbalsa.h"
-#include "files.h"
 #include <glib/gi18n.h>
 
 static const gchar *permanent_prefixes[] = {

Modified: trunk/libbalsa/files.h
==============================================================================
--- trunk/libbalsa/files.h	(original)
+++ trunk/libbalsa/files.h	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2000 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,10 +23,10 @@
 #ifndef _BALSA_FILES_H
 #define _BALSA_FILES_H
 
-#include "config.h"
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
+#include "body.h"
 #include "libbalsa-vfs.h"
 
 /* filename is the filename (naw!)

Modified: trunk/libbalsa/filter-error.c
==============================================================================
--- trunk/libbalsa/filter-error.c	(original)
+++ trunk/libbalsa/filter-error.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2000 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,9 @@
  * Functions for dealing with errors in the filter system
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include "filter.h"
 #include <glib/gi18n.h>

Modified: trunk/libbalsa/filter-file.c
==============================================================================
--- trunk/libbalsa/filter-file.c	(original)
+++ trunk/libbalsa/filter-file.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,10 @@
  *
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "filter-file.h"
 
 /* extensions  needed additonally on Solaris for strptime */
 #define __EXTENSIONS__
@@ -41,7 +44,6 @@
 #include <time.h>
 #include <sys/types.h>
 
-#include "filter-file.h"
 #include "filter-private.h"
 #include "filter-funcs.h"
 #include "libbalsa-conf.h"

Modified: trunk/libbalsa/filter-funcs.c
==============================================================================
--- trunk/libbalsa/filter-funcs.c	(original)
+++ trunk/libbalsa/filter-funcs.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,14 +24,17 @@
  * filter-funcs.c
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "filter-funcs.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include "missing.h"
 
-#include "filter-funcs.h"
 #include "filter-private.h"
 
 /* Conditions */

Modified: trunk/libbalsa/filter.c
==============================================================================
--- trunk/libbalsa/filter.c	(original)
+++ trunk/libbalsa/filter.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,10 @@
  * Primary author: Emmanuel ALLAUD
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "filter.h"
 
 #include <ctype.h>
 #include <string.h>
@@ -41,7 +44,6 @@
 #include "libbalsa.h"
 #include "libbalsa_private.h"
 
-#include "filter.h"
 #include "filter-funcs.h"
 #include "filter-private.h"
 #include "misc.h"

Modified: trunk/libbalsa/folder-scanners.c
==============================================================================
--- trunk/libbalsa/folder-scanners.c	(original)
+++ trunk/libbalsa/folder-scanners.c	Thu Feb 26 04:58:24 2009
@@ -1,6 +1,6 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "folder-scanners.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -34,7 +36,6 @@
 #include <limits.h>
 
 #include "libbalsa.h"
-#include "folder-scanners.h"
 #include "libimap.h"
 #include "imap-handle.h"
 #include "imap-commands.h"

Modified: trunk/libbalsa/folder-scanners.h
==============================================================================
--- trunk/libbalsa/folder-scanners.h	(original)
+++ trunk/libbalsa/folder-scanners.h	Thu Feb 26 04:58:24 2009
@@ -1,6 +1,6 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
- * Copyright (C) 1997-2002 Stuart Parmenter and others,
+ * Copyright (C) 1997-2009 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,9 @@
 #ifndef __FOLDER_SCANNERS_H__
 #define __FOLDER_SCANNERS_H__
 
+#include <glib-object.h>
+#include "libbalsa.h"
+
 typedef gboolean LocalCheck(const gchar * fn, guint depth);
 typedef gboolean LocalMark(gpointer node);
 typedef gpointer LocalHandler(gpointer root, const char *d_name,

Modified: trunk/libbalsa/gmime-gpgme-context.c
==============================================================================
--- trunk/libbalsa/gmime-gpgme-context.c	(original)
+++ trunk/libbalsa/gmime-gpgme-context.c	Thu Feb 26 04:58:24 2009
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /*
  * gmime/gpgme glue layer library
- * Copyright (C) 2004 Albrecht Dreß<albrecht dress arcor de>
+ * Copyright (C) 2004-2009 Albrecht Dreß<albrecht dress arcor de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,14 +18,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
  * 02111-1307, USA.
  */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "gmime-gpgme-context.h"
 
 #include <string.h>
 #include <glib.h>
 #include <gmime/gmime.h>
 #include <gpgme.h>
 #include <time.h>
-#include "gmime-gpgme-context.h"
 #include <glib/gi18n.h>
 
 #define GPGME_ERROR_QUARK (g_quark_from_static_string ("gmime-gpgme"))

Modified: trunk/libbalsa/gmime-part-rfc2440.c
==============================================================================
--- trunk/libbalsa/gmime-part-rfc2440.c	(original)
+++ trunk/libbalsa/gmime-part-rfc2440.c	Thu Feb 26 04:58:24 2009
@@ -19,11 +19,13 @@
  * 02111-1307, USA.
  */
 
-#include <string.h>
-#include <config.h>
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "gmime-part-rfc2440.h"
 
+#include <string.h>
 #include <gmime/gmime.h>
-#include "gmime-part-rfc2440.h"
 
 
 #define RFC2440_BUF_LEN    4096

Modified: trunk/libbalsa/gmime-stream-gio.c
==============================================================================
--- trunk/libbalsa/gmime-stream-gio.c	(original)
+++ trunk/libbalsa/gmime-stream-gio.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,10 @@
  *  02110-1301, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "gmime-stream-gio.h"
 
 /* note: this module will be compiled only if GIO is available */
 #if HAVE_GIO
@@ -30,9 +33,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "gmime-stream-gio.h"
-
-
 static void g_mime_stream_gio_class_init(GMimeStreamGioClass *klass);
 static void g_mime_stream_gio_init(GMimeStreamGio *stream,
 				   GMimeStreamGioClass *klass);

Modified: trunk/libbalsa/gmime-stream-gio.h
==============================================================================
--- trunk/libbalsa/gmime-stream-gio.h	(original)
+++ trunk/libbalsa/gmime-stream-gio.h	Thu Feb 26 04:58:24 2009
@@ -24,8 +24,6 @@
 #ifndef __GMIME_STREAM_GIO_H__
 #define __GMIME_STREAM_GIO_H__
 
-#include "config.h"
-
 /* note: this module will be compiled only if GIO is available */
 #if HAVE_GIO
 

Modified: trunk/libbalsa/gmime-stream-gnome-vfs.c
==============================================================================
--- trunk/libbalsa/gmime-stream-gnome-vfs.c	(original)
+++ trunk/libbalsa/gmime-stream-gnome-vfs.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,10 @@
  *  02110-1301, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "gmime-stream-gnome-vfs.h"
 
 /* note: this module will be compiled only if Gnome-Vfs is available */
 #ifdef HAVE_GNOME_VFS
@@ -30,9 +33,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "gmime-stream-gnome-vfs.h"
-
-
 /**
  * SECTION: gmime-stream-gvfs
  * @title: GMimeStreamGvfs

Modified: trunk/libbalsa/gmime-stream-gnome-vfs.h
==============================================================================
--- trunk/libbalsa/gmime-stream-gnome-vfs.h	(original)
+++ trunk/libbalsa/gmime-stream-gnome-vfs.h	Thu Feb 26 04:58:24 2009
@@ -24,8 +24,6 @@
 #ifndef __GMIME_STREAM_GVFS_H__
 #define __GMIME_STREAM_GVFS_H__
 
-#include "config.h"
-
 /* note: this module will be compiled only if Gnome-Vfs is available */
 #ifdef HAVE_GNOME_VFS
 

Modified: trunk/libbalsa/html.c
==============================================================================
--- trunk/libbalsa/html.c	(original)
+++ trunk/libbalsa/html.c	Thu Feb 26 04:58:24 2009
@@ -35,13 +35,14 @@
  * more complete API.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "html.h"
 
 #include <stdio.h>
 #include <string.h>
 
-#include "html.h"
-
 #ifdef HAVE_GTKHTML
 
 /* We need the declaration of LibBalsaMessage, but including "message.h"

Modified: trunk/libbalsa/html.h
==============================================================================
--- trunk/libbalsa/html.h	(original)
+++ trunk/libbalsa/html.h	Thu Feb 26 04:58:24 2009
@@ -23,8 +23,6 @@
 #ifndef   __LIBBALSA_HTML_H__
 # define  __LIBBALSA_HTML_H__
 
-#include "config.h"
-
 # if defined(HAVE_GTKHTML2)
 /* gtkhtml2 uses deprecated api */
 #  undef GTK_DISABLE_DEPRECATED

Modified: trunk/libbalsa/identity.c
==============================================================================
--- trunk/libbalsa/identity.c	(original)
+++ trunk/libbalsa/identity.c	Thu Feb 26 04:58:24 2009
@@ -19,13 +19,15 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "identity.h"
 
 #ifdef HAVE_GPGME
 #  include "rfc3156.h"
 #endif
 #include "libbalsa.h"
-#include "identity.h"
 #include "information.h"
 #include "libbalsa-conf.h"
 #include <glib/gi18n.h>

Modified: trunk/libbalsa/identity.h
==============================================================================
--- trunk/libbalsa/identity.h	(original)
+++ trunk/libbalsa/identity.h	Thu Feb 26 04:58:24 2009
@@ -23,8 +23,6 @@
 #ifndef __LIBBALSA_IDENTITY_H__
 #define __LIBBALSA_IDENTITY_H__
 
-#include "config.h"
-
 #include <gtk/gtk.h>
 #include <gmime/internet-address.h>
 
@@ -52,7 +50,6 @@
 #define LIBBALSA_IS_IDENTITY_CLASS(klass) \
     (G_TYPE_CHECK_CLASS_TYPE (klass, LIBBALSA_TYPE_IDENTITY))
 
-    typedef struct _LibBalsaIdentity LibBalsaIdentity;
     typedef struct _LibBalsaIdentityClass LibBalsaIdentityClass;
     
     

Modified: trunk/libbalsa/imap-server.c
==============================================================================
--- trunk/libbalsa/imap-server.c	(original)
+++ trunk/libbalsa/imap-server.c	Thu Feb 26 04:58:24 2009
@@ -5,7 +5,10 @@
   the user switches to offline mode.
 */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "imap-server.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -20,7 +23,6 @@
 #include "server.h"
 
 #include "imap-handle.h"
-#include "imap-server.h"
 #include "imap-commands.h"
 #include <glib/gi18n.h>
 

Modified: trunk/libbalsa/imap-server.h
==============================================================================
--- trunk/libbalsa/imap-server.h	(original)
+++ trunk/libbalsa/imap-server.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,8 @@
 #ifndef __IMAP_SERVER_H__
 #define __IMAP_SERVER_H__
 
+#include <glib-object.h>
+
 #define LIBBALSA_TYPE_IMAP_SERVER \
     (libbalsa_imap_server_get_type())
 #define LIBBALSA_IMAP_SERVER(obj) \

Modified: trunk/libbalsa/information.c
==============================================================================
--- trunk/libbalsa/information.c	(original)
+++ trunk/libbalsa/information.c	Thu Feb 26 04:58:24 2009
@@ -20,9 +20,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "information.h"
+
 #ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
 #include <gtk/gtk.h>

Modified: trunk/libbalsa/libbalsa-conf.h
==============================================================================
--- trunk/libbalsa/libbalsa-conf.h	(original)
+++ trunk/libbalsa/libbalsa-conf.h	Thu Feb 26 04:58:24 2009
@@ -23,8 +23,6 @@
 #ifndef __LIBCONFIG_H__
 #define __LIBCONFIG_H__
 
-#include "config.h"
-
 #include <gtk/gtk.h>
 
 void libbalsa_conf_push_group(const char *group);

Modified: trunk/libbalsa/libbalsa-vfs.c
==============================================================================
--- trunk/libbalsa/libbalsa-vfs.c	(original)
+++ trunk/libbalsa/libbalsa-vfs.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "libbalsa-vfs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32,7 +35,6 @@
 #include <gmime/gmime.h>
 #include "libbalsa.h"
 #include "misc.h"
-#include "libbalsa-vfs.h"
 
 #if HAVE_GIO
 #  include <gio/gio.h>

Modified: trunk/libbalsa/libbalsa-vfs.h
==============================================================================
--- trunk/libbalsa/libbalsa-vfs.h	(original)
+++ trunk/libbalsa/libbalsa-vfs.h	Thu Feb 26 04:58:24 2009
@@ -42,7 +42,6 @@
 #define LIBBALSA_IS_VFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), LIBBALSA_TYPE_VFS))
 #define LIBBALSA_VFS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), LIBBALSA_TYPE_VFS, LibbalsaVfsClass))
 
-typedef struct _LibbalsaVfs LibbalsaVfs;
 typedef struct _LibbalsaVfsClass LibbalsaVfsClass;
 
 

Modified: trunk/libbalsa/libbalsa.c
==============================================================================
--- trunk/libbalsa/libbalsa.c	(original)
+++ trunk/libbalsa/libbalsa.c	Thu Feb 26 04:58:24 2009
@@ -20,8 +20,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "libbalsa.h"
 
 #include <glib.h>
 
@@ -59,7 +61,6 @@
 #endif
 #endif
 
-#include "libbalsa.h"
 #include "misc.h"
 #include "missing.h"
 #include <glib/gi18n.h>

Modified: trunk/libbalsa/libbalsa.h
==============================================================================
--- trunk/libbalsa/libbalsa.h	(original)
+++ trunk/libbalsa/libbalsa.h	Thu Feb 26 04:58:24 2009
@@ -23,6 +23,8 @@
 #ifndef __LIBBALSA_H__
 #define __LIBBALSA_H__
 
+typedef struct _LibBalsaCondition LibBalsaCondition;
+typedef struct _LibBalsaIdentity LibBalsaIdentity;
 typedef struct _LibBalsaMailbox LibBalsaMailbox;
 typedef struct _LibBalsaMailboxRemote LibBalsaMailboxRemote;
 typedef struct _LibBalsaMailboxSearchIter LibBalsaMailboxSearchIter;
@@ -31,7 +33,7 @@
 typedef struct _LibBalsaMessageBody LibBalsaMessageBody;
 typedef struct _LibBalsaServer LibBalsaServer;
 typedef struct _LibBalsaSmtpServer LibBalsaSmtpServer;
-typedef struct _LibBalsaCondition LibBalsaCondition;
+typedef struct _LibbalsaVfs LibbalsaVfs;
 
 
 #include "message.h"

Modified: trunk/libbalsa/mailbox-filter.c
==============================================================================
--- trunk/libbalsa/mailbox-filter.c	(original)
+++ trunk/libbalsa/mailbox-filter.c	Thu Feb 26 04:58:24 2009
@@ -27,7 +27,10 @@
  * Author : Emmanuel Allaud
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+
 #include <string.h>
 
 #include "filter-file.h"

Modified: trunk/libbalsa/mailbox.c
==============================================================================
--- trunk/libbalsa/mailbox.c	(original)
+++ trunk/libbalsa/mailbox.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <ctype.h>
 #include <string.h>

Modified: trunk/libbalsa/mailbox.h
==============================================================================
--- trunk/libbalsa/mailbox.h	(original)
+++ trunk/libbalsa/mailbox.h	Thu Feb 26 04:58:24 2009
@@ -25,7 +25,6 @@
 
 #include <gdk/gdk.h>
 #include <gmime/gmime.h>
-#include "config.h"
 
 #ifdef BALSA_USE_THREADS
 #include <pthread.h>

Modified: trunk/libbalsa/mailbox_imap.c
==============================================================================
--- trunk/libbalsa/mailbox_imap.c	(original)
+++ trunk/libbalsa/mailbox_imap.c	Thu Feb 26 04:58:24 2009
@@ -28,7 +28,9 @@
    responses particularly for shared mailboxes before you try messing
    with this.
 */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 
 #include <stdlib.h>

Modified: trunk/libbalsa/mailbox_local.c
==============================================================================
--- trunk/libbalsa/mailbox_local.c	(original)
+++ trunk/libbalsa/mailbox_local.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: trunk/libbalsa/mailbox_local.h
==============================================================================
--- trunk/libbalsa/mailbox_local.h	(original)
+++ trunk/libbalsa/mailbox_local.h	Thu Feb 26 04:58:24 2009
@@ -23,6 +23,8 @@
 #ifndef __LIBBALSA_MAILBOX_LOCAL_H__
 #define __LIBBALSA_MAILBOX_LOCAL_H__
 
+#include "libbalsa.h"
+
 #define LIBBALSA_TYPE_MAILBOX_LOCAL \
     (libbalsa_mailbox_local_get_type())
 #define LIBBALSA_MAILBOX_LOCAL(obj) \

Modified: trunk/libbalsa/mailbox_maildir.c
==============================================================================
--- trunk/libbalsa/mailbox_maildir.c	(original)
+++ trunk/libbalsa/mailbox_maildir.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 
 #include <unistd.h>

Modified: trunk/libbalsa/mailbox_mbox.c
==============================================================================
--- trunk/libbalsa/mailbox_mbox.c	(original)
+++ trunk/libbalsa/mailbox_mbox.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 
 #include <gmime/gmime-stream-fs.h>

Modified: trunk/libbalsa/mailbox_mh.c
==============================================================================
--- trunk/libbalsa/mailbox_mh.c	(original)
+++ trunk/libbalsa/mailbox_mh.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 /* to compile this on BSD/Darwin */
 #undef _POSIX_SOURCE

Modified: trunk/libbalsa/mailbox_pop3.c
==============================================================================
--- trunk/libbalsa/mailbox_pop3.c	(original)
+++ trunk/libbalsa/mailbox_pop3.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 
 #include <stdio.h>

Modified: trunk/libbalsa/mailbox_remote.c
==============================================================================
--- trunk/libbalsa/mailbox_remote.c	(original)
+++ trunk/libbalsa/mailbox_remote.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include "libbalsa.h"
 

Modified: trunk/libbalsa/message.c
==============================================================================
--- trunk/libbalsa/message.c	(original)
+++ trunk/libbalsa/message.c	Thu Feb 26 04:58:24 2009
@@ -30,7 +30,9 @@
    - thorough analysis of memory usage is needed.
 */
    
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <ctype.h>
 #include <string.h>

Modified: trunk/libbalsa/message.h
==============================================================================
--- trunk/libbalsa/message.h	(original)
+++ trunk/libbalsa/message.h	Thu Feb 26 04:58:24 2009
@@ -29,7 +29,6 @@
 
 #include <gmime/gmime.h>
 
-#include "config.h"
 #ifdef HAVE_GPGME
 #include "rfc3156.h"
 #endif

Modified: trunk/libbalsa/mime-stream-shared.c
==============================================================================
--- trunk/libbalsa/mime-stream-shared.c	(original)
+++ trunk/libbalsa/mime-stream-shared.c	Thu Feb 26 04:58:24 2009
@@ -31,13 +31,16 @@
  * read+test-eos.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #if BALSA_USE_THREADS
 
+#include "mime-stream-shared.h"
+
 #include <gmime/gmime-stream.h>
 #include <gmime/gmime-stream-filter.h>
-#include "mime-stream-shared.h"
 
 typedef struct _LibBalsaMimeStreamSharedLock LibBalsaMimeStreamSharedLock;
 

Modified: trunk/libbalsa/mime-stream-shared.h
==============================================================================
--- trunk/libbalsa/mime-stream-shared.h	(original)
+++ trunk/libbalsa/mime-stream-shared.h	Thu Feb 26 04:58:24 2009
@@ -20,8 +20,6 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
 #ifndef __LIBBALSA_MIME_STREAM_SHARED_H__
 #define __LIBBALSA_MIME_STREAM_SHARED_H__
 

Modified: trunk/libbalsa/mime.c
==============================================================================
--- trunk/libbalsa/mime.c	(original)
+++ trunk/libbalsa/mime.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <string.h>
 #include <ctype.h>

Modified: trunk/libbalsa/misc.c
==============================================================================
--- trunk/libbalsa/misc.c	(original)
+++ trunk/libbalsa/misc.c	Thu Feb 26 04:58:24 2009
@@ -24,7 +24,10 @@
    this file can be linked against the address book program balsa-ab
    without introducing extra dependencies. External library
    dependencies should go to libbalsa.c */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "misc.h"
 
 #define _SVID_SOURCE           1
 #include <ctype.h>
@@ -40,7 +43,6 @@
 
 #include "libbalsa.h"
 #include "libbalsa_private.h"
-#include "misc.h"
 #include "html.h"
 #include <glib/gi18n.h>
 

Modified: trunk/libbalsa/missing_time.c
==============================================================================
--- trunk/libbalsa/missing_time.c	(original)
+++ trunk/libbalsa/missing_time.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "missing.h"
 
 #include <string.h>
 
@@ -34,9 +37,6 @@
 #define UNLOCK(mutex)
 #endif /* HAVE_THREADS */
 
-#include "missing.h"
-
-
 #ifndef HAVE_CTIME_R
 char *
 ctime_r(const time_t *clock, char *buf)

Modified: trunk/libbalsa/rfc2445.c
==============================================================================
--- trunk/libbalsa/rfc2445.c	(original)
+++ trunk/libbalsa/rfc2445.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "rfc2445.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -29,7 +32,6 @@
 
 #include "libbalsa.h"
 #include "missing.h"
-#include "rfc2445.h"
 
 
 /* participant roles as defined by RFC 2446 */

Modified: trunk/libbalsa/rfc3156.c
==============================================================================
--- trunk/libbalsa/rfc3156.c	(original)
+++ trunk/libbalsa/rfc3156.c	Thu Feb 26 04:58:24 2009
@@ -18,7 +18,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
  * 02111-1307, USA.
  */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "rfc3156.h"
 
 #ifdef HAVE_GPGME
 
@@ -31,7 +34,6 @@
 
 #include "libbalsa.h"
 #include "libbalsa_private.h"
-#include "rfc3156.h"
 
 #include "gmime-gpgme-context.h"
 #include "gmime-gpgme-signature.h"

Modified: trunk/libbalsa/rfc3156.h
==============================================================================
--- trunk/libbalsa/rfc3156.h	(original)
+++ trunk/libbalsa/rfc3156.h	Thu Feb 26 04:58:24 2009
@@ -22,8 +22,6 @@
 #ifndef __RFC3156_H__
 #define __RFC3156_H__
 
-#include "config.h"
-
 #ifdef HAVE_GPGME
 
 #include <gpgme.h>

Modified: trunk/libbalsa/send.c
==============================================================================
--- trunk/libbalsa/send.c	(original)
+++ trunk/libbalsa/send.c	Thu Feb 26 04:58:24 2009
@@ -20,10 +20,13 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #define _BSD_SOURCE     1 
 #define _POSIX_C_SOURCE 199309L
+#include "send.h"
 
 #include <fcntl.h>
 #include <errno.h>
@@ -40,7 +43,6 @@
 #include "libbalsa_private.h"
 
 #include "server.h"
-#include "send.h"
 #include "misc.h"
 #include "missing.h"
 #include "information.h"

Modified: trunk/libbalsa/send.h
==============================================================================
--- trunk/libbalsa/send.h	(original)
+++ trunk/libbalsa/send.h	Thu Feb 26 04:58:24 2009
@@ -24,6 +24,8 @@
 #ifndef __SEND_H__
 #define __SEND_H__
 
+#include "libbalsa.h"
+
 typedef LibBalsaMailbox* (*LibBalsaFccboxFinder)(const gchar *url);
 typedef enum _LibBalsaMsgCreateResult LibBalsaMsgCreateResult;
 enum _LibBalsaMsgCreateResult {

Modified: trunk/libbalsa/server.c
==============================================================================
--- trunk/libbalsa/server.c	(original)
+++ trunk/libbalsa/server.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "server.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -34,7 +37,6 @@
 #endif
 
 #include "libbalsa.h"
-#include "server.h"
 #include "libbalsa_private.h"
 #include "libbalsa-marshal.h"
 #include "libbalsa-conf.h"

Modified: trunk/libbalsa/smtp-server.c
==============================================================================
--- trunk/libbalsa/smtp-server.c	(original)
+++ trunk/libbalsa/smtp-server.c	Thu Feb 26 04:58:24 2009
@@ -19,17 +19,19 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
  * 02111-1307, USA.
  */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+
 #if ENABLE_ESMTP
 /*
  * LibBalsaSmtpServer is a subclass of LibBalsaServer.
  */
+#include "server.h"
 
 #include <string.h>
-#include <libesmtp.h>
 
 #include "libbalsa.h"
-#include "server.h"
 #include "smtp-server.h"
 #include "libbalsa-conf.h"
 #include "misc.h"

Modified: trunk/libbalsa/smtp-server.h
==============================================================================
--- trunk/libbalsa/smtp-server.h	(original)
+++ trunk/libbalsa/smtp-server.h	Thu Feb 26 04:58:24 2009
@@ -24,6 +24,7 @@
 #define __SMTP_SERVER_H__
 
 #include <gtk/gtk.h>
+#include <libesmtp.h>
 #include "libbalsa.h"
 
 #define LIBBALSA_TYPE_SMTP_SERVER				\

Modified: trunk/libbalsa/source-viewer.c
==============================================================================
--- trunk/libbalsa/source-viewer.c	(original)
+++ trunk/libbalsa/source-viewer.c	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,9 @@
    in in a GtkText widget.
 */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 

Modified: trunk/libinit_balsa/assistant_helper.c
==============================================================================
--- trunk/libinit_balsa/assistant_helper.c	(original)
+++ trunk/libinit_balsa/assistant_helper.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "assistant_helper.h"
 
 #include <errno.h>
 #include <sys/types.h>
@@ -29,7 +32,6 @@
 #include <unistd.h>
 #include <gtk/gtk.h>
 
-#include "assistant_helper.h"
 #include <glib/gi18n.h>
 #include "libbalsa.h"
 #include "url.h"

Modified: trunk/libinit_balsa/assistant_helper.h
==============================================================================
--- trunk/libinit_balsa/assistant_helper.h	(original)
+++ trunk/libinit_balsa/assistant_helper.h	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,6 @@
 #ifndef LIBINIT_BALSA_HELPER_H
 #define LIBINIT_BALSA_HELPER_H
 
-#include "config.h"
 #include <gtk/gtk.h>
 
 typedef struct EntryData_s EntryData;

Modified: trunk/libinit_balsa/assistant_init.h
==============================================================================
--- trunk/libinit_balsa/assistant_init.h	(original)
+++ trunk/libinit_balsa/assistant_init.h	Thu Feb 26 04:58:24 2009
@@ -27,8 +27,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-#include "config.h"
-
 #include <gtk/gtk.h>
 #include "assistant_helper.h"
 

Modified: trunk/libinit_balsa/assistant_page_defclient.h
==============================================================================
--- trunk/libinit_balsa/assistant_page_defclient.h	(original)
+++ trunk/libinit_balsa/assistant_page_defclient.h	Thu Feb 26 04:58:24 2009
@@ -28,10 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
-
 #if HAVE_GNOME
 /* setting the default Gnome mail client doesn't make sense if we don't build
  for Gnome */

Modified: trunk/libinit_balsa/assistant_page_directory.c
==============================================================================
--- trunk/libinit_balsa/assistant_page_directory.c	(original)
+++ trunk/libinit_balsa/assistant_page_directory.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,10 @@
  */
 
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "assistant_page_directory.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30,8 +33,6 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "assistant_page_directory.h"
-
 #include <glib/gi18n.h>
 #include "balsa-app.h"
 #include "save-restore.h"

Modified: trunk/libinit_balsa/assistant_page_directory.h
==============================================================================
--- trunk/libinit_balsa/assistant_page_directory.h	(original)
+++ trunk/libinit_balsa/assistant_page_directory.h	Thu Feb 26 04:58:24 2009
@@ -26,8 +26,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-#include "config.h"
-
 #include <gtk/gtk.h>
 
 #include "assistant_helper.h"

Modified: trunk/libinit_balsa/assistant_page_finish.c
==============================================================================
--- trunk/libinit_balsa/assistant_page_finish.c	(original)
+++ trunk/libinit_balsa/assistant_page_finish.c	Thu Feb 26 04:58:24 2009
@@ -19,10 +19,12 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "assistant_page_finish.h"
 
 #include "assistant_page_directory.h"
-#include "assistant_page_finish.h"
 
 #include <glib/gi18n.h>
 #include "save-restore.h"

Modified: trunk/libinit_balsa/assistant_page_finish.h
==============================================================================
--- trunk/libinit_balsa/assistant_page_finish.h	(original)
+++ trunk/libinit_balsa/assistant_page_finish.h	Thu Feb 26 04:58:24 2009
@@ -27,9 +27,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
 #include <gtk/gtk.h>
 
 #include "assistant_helper.h"

Modified: trunk/libinit_balsa/assistant_page_user.c
==============================================================================
--- trunk/libinit_balsa/assistant_page_user.c	(original)
+++ trunk/libinit_balsa/assistant_page_user.c	Thu Feb 26 04:58:24 2009
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "assistant_page_user.h"
 
 #include <sys/types.h>

Modified: trunk/libinit_balsa/assistant_page_user.h
==============================================================================
--- trunk/libinit_balsa/assistant_page_user.h	(original)
+++ trunk/libinit_balsa/assistant_page_user.h	Thu Feb 26 04:58:24 2009
@@ -26,10 +26,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
-
 #include <gtk/gtk.h>
 #include "assistant_helper.h"
 #include "assistant_init.h"

Modified: trunk/libinit_balsa/assistant_page_welcome.h
==============================================================================
--- trunk/libinit_balsa/assistant_page_welcome.h	(original)
+++ trunk/libinit_balsa/assistant_page_welcome.h	Thu Feb 26 04:58:24 2009
@@ -26,9 +26,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
 #include <gtk/gtk.h>
 #include "assistant_helper.h"
 #include "assistant_init.h"

Modified: trunk/libinit_balsa/balsa-druid-page-defclient.h
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-defclient.h	(original)
+++ trunk/libinit_balsa/balsa-druid-page-defclient.h	Thu Feb 26 04:58:24 2009
@@ -28,9 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
 #include "helper.h"
 #include "balsa-initdruid.h"
 

Modified: trunk/libinit_balsa/balsa-druid-page-directory.h
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-directory.h	(original)
+++ trunk/libinit_balsa/balsa-druid-page-directory.h	Thu Feb 26 04:58:24 2009
@@ -28,7 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-#include "config.h"
 #include <gnome.h>
 #include "helper.h"
 #include "balsa-initdruid.h"

Modified: trunk/libinit_balsa/balsa-druid-page-finish.c
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-finish.c	(original)
+++ trunk/libinit_balsa/balsa-druid-page-finish.c	Thu Feb 26 04:58:24 2009
@@ -19,10 +19,12 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-druid-page-finish.h"
 
 #include "balsa-druid-page-directory.h"
-#include "balsa-druid-page-finish.h"
 
 #include <glib/gi18n.h>
 #include "save-restore.h"

Modified: trunk/libinit_balsa/balsa-druid-page-finish.h
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-finish.h	(original)
+++ trunk/libinit_balsa/balsa-druid-page-finish.h	Thu Feb 26 04:58:24 2009
@@ -28,9 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
 #include <gnome.h>
 #include "helper.h"
 #include "balsa-initdruid.h"

Modified: trunk/libinit_balsa/balsa-druid-page-user.c
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-user.c	(original)
+++ trunk/libinit_balsa/balsa-druid-page-user.c	Thu Feb 26 04:58:24 2009
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "balsa-druid-page-user.h"
 
 #include <sys/types.h>

Modified: trunk/libinit_balsa/balsa-druid-page-user.h
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-user.h	(original)
+++ trunk/libinit_balsa/balsa-druid-page-user.h	Thu Feb 26 04:58:24 2009
@@ -28,9 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
 #include <gnome.h>
 #include "helper.h"
 #include "balsa-initdruid.h"

Modified: trunk/libinit_balsa/balsa-druid-page-welcome.h
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-welcome.h	(original)
+++ trunk/libinit_balsa/balsa-druid-page-welcome.h	Thu Feb 26 04:58:24 2009
@@ -28,9 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-
-
-#include "config.h"
 #include <gnome.h>
 #include "helper.h"
 #include "balsa-initdruid.h"

Modified: trunk/libinit_balsa/balsa-initdruid.h
==============================================================================
--- trunk/libinit_balsa/balsa-initdruid.h	(original)
+++ trunk/libinit_balsa/balsa-initdruid.h	Thu Feb 26 04:58:24 2009
@@ -28,7 +28,6 @@
 extern "C" {
 #endif                          /* __cplusplus */
 
-#include "config.h"
 #include <gnome.h>
 #include "helper.h"
 

Modified: trunk/libinit_balsa/helper.c
==============================================================================
--- trunk/libinit_balsa/helper.c	(original)
+++ trunk/libinit_balsa/helper.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "helper.h"
+
 #include <gnome.h>
 
 #include <errno.h>
@@ -29,7 +33,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "helper.h"
 #include <glib/gi18n.h>
 #include "libbalsa.h"
 #include "url.h"

Modified: trunk/libinit_balsa/helper.h
==============================================================================
--- trunk/libinit_balsa/helper.h	(original)
+++ trunk/libinit_balsa/helper.h	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,6 @@
 #ifndef LIBINIT_BALSA_HELPER_H
 #define LIBINIT_BALSA_HELPER_H
 
-#include "config.h"
 #include <gnome.h>
 
 typedef struct EntryData_s EntryData;

Modified: trunk/libinit_balsa/init_balsa.c
==============================================================================
--- trunk/libinit_balsa/init_balsa.c	(original)
+++ trunk/libinit_balsa/init_balsa.c	Thu Feb 26 04:58:24 2009
@@ -19,11 +19,13 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "init_balsa.h"
 
 #include <gtk/gtk.h>
 
-#include "init_balsa.h"
 #ifdef HAVE_GNOME
 #include "helper.h"
 #include "balsa-initdruid.h"

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Feb 26 04:58:24 2009
@@ -150,13 +150,13 @@
 idldir = $(datadir)/idl
 idl_DATA = Balsa.idl
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_srcdir)/libbalsa \
-	$(BALSA_CFLAGS)
+	$(BALSA_DEFS)
 
-DEFS = $(BALSA_DEFS)
+AM_CFLAGS = $(BALSA_CFLAGS)
 
 balsa_LDADD = \
 	$(top_builddir)/libinit_balsa/libinit_balsa.a \

Modified: trunk/src/ab-main.c
==============================================================================
--- trunk/src/ab-main.c	(original)
+++ trunk/src/ab-main.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/src/ab-window.c
==============================================================================
--- trunk/src/ab-window.c	(original)
+++ trunk/src/ab-window.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "ab-window.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
@@ -27,7 +30,6 @@
 #include "balsa-app.h"
 #include "sendmsg-window.h"
 #include "save-restore.h"
-#include "ab-window.h"
 
 enum {
     LIST_COLUMN_NAME,

Modified: trunk/src/ab-window.h
==============================================================================
--- trunk/src/ab-window.h	(original)
+++ trunk/src/ab-window.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,9 @@
 #ifndef __AB_WINDOW_H__
 #define __AB_WINDOW_H__
 
+#include <gtk/gtk.h>
+#include <libbalsa.h>
+
 #define BALSA_TYPE_AB_WINDOW            (balsa_ab_window_get_type ())
 #define BALSA_AB_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), BALSA_TYPE_AB_WINDOW, BalsaAbWindow))
 #define BALSA_AB_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), BALSA_TYPE_AB_WINDOW, BalsaAbWindowClass))

Modified: trunk/src/address-book-config.c
==============================================================================
--- trunk/src/address-book-config.c	(original)
+++ trunk/src/address-book-config.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "address-book-config.h"
 
 #include <gtk/gtk.h>
 
@@ -30,7 +33,6 @@
 #endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 
 #include "balsa-app.h"
-#include "address-book-config.h"
 #include <glib/gi18n.h>
 
 typedef struct _AddressBookConfig AddressBookConfig;

Modified: trunk/src/balsa-app.c
==============================================================================
--- trunk/src/balsa-app.c	(original)
+++ trunk/src/balsa-app.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-app.h"
+
 #include <string.h>
 #include <stdlib.h>
 #ifdef BALSA_USE_THREADS
@@ -35,7 +39,6 @@
 #include "misc.h"
 #include "server.h"
 #include "smtp-server.h"
-#include "balsa-app.h"
 #include "save-restore.h"
 
 #include <glib/gi18n.h>	/* Must come after balsa-app.h. */

Modified: trunk/src/balsa-bonobo.c
==============================================================================
--- trunk/src/balsa-bonobo.c	(original)
+++ trunk/src/balsa-bonobo.c	Thu Feb 26 04:58:24 2009
@@ -20,7 +20,10 @@
  */
 
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-bonobo.h"
 
 #if HAVE_GNOME
 
@@ -34,9 +37,6 @@
 #include "balsa-app.h"
 #include "sendmsg-window.h"
 
-#include "balsa-bonobo.h"
-
-
 static void balsa_composer_class_init (BalsaComposerClass *klass);
 static void balsa_composer_init (BalsaComposer *a);
 static void balsa_composer_object_finalize (GObject *object);

Modified: trunk/src/balsa-bonobo.h
==============================================================================
--- trunk/src/balsa-bonobo.h	(original)
+++ trunk/src/balsa-bonobo.h	Thu Feb 26 04:58:24 2009
@@ -24,8 +24,6 @@
 #ifndef __BALSA_BONOBO_H
 #define __BALSA_BONOBO_H
 
-#include "config.h"
-
 #if HAVE_GNOME
 
 #include "Balsa.h" 

Modified: trunk/src/balsa-icons.c
==============================================================================
--- trunk/src/balsa-icons.c	(original)
+++ trunk/src/balsa-icons.c	Thu Feb 26 04:58:24 2009
@@ -21,9 +21,11 @@
 
 #include <string.h>
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "balsa-icons.h"
+
 #include "libbalsa.h"
 #include "mailbox.h"
 #include "address-view.h"

Modified: trunk/src/balsa-icons.h
==============================================================================
--- trunk/src/balsa-icons.h	(original)
+++ trunk/src/balsa-icons.h	Thu Feb 26 04:58:24 2009
@@ -23,7 +23,6 @@
 #define __BALSA_ICONS_H__
 
 #include <gtk/gtk.h>
-#include "config.h"
 
 #define BALSA_PIXMAP_ATTACHMENT			"balsa_attachment"
 #define BALSA_PIXMAP_COMPOSE			"balsa_compose"

Modified: trunk/src/balsa-index.c
==============================================================================
--- trunk/src/balsa-index.c	(original)
+++ trunk/src/balsa-index.c	Thu Feb 26 04:58:24 2009
@@ -30,7 +30,10 @@
    key and replace the key on every change of the sort method.  
 */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-index.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -38,7 +41,6 @@
 
 #include "balsa-app.h"
 #include "balsa-icons.h"
-#include "balsa-index.h"
 #include "balsa-mblist.h"
 #include "balsa-message.h"
 #include "main-window.h"

Modified: trunk/src/balsa-mblist.c
==============================================================================
--- trunk/src/balsa-mblist.c	(original)
+++ trunk/src/balsa-mblist.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mblist.h"
 
 /* #include <gtk/gtkfeatures.h> */
 #include <string.h>
@@ -28,7 +31,6 @@
 #include "balsa-app.h"
 #include "balsa-icons.h"
 #include "balsa-index.h"
-#include "balsa-mblist.h"
 #include "libbalsa.h"
 #include <glib/gi18n.h>
 #include "mailbox-node.h"

Modified: trunk/src/balsa-message.c
==============================================================================
--- trunk/src/balsa-message.c	(original)
+++ trunk/src/balsa-message.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-message.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -29,7 +32,6 @@
 #include <sys/utsname.h>
 
 #include "balsa-app.h"
-#include "balsa-message.h"
 #include "balsa-icons.h"
 #include "mime.h"
 #include "misc.h"

Modified: trunk/src/balsa-message.h
==============================================================================
--- trunk/src/balsa-message.h	(original)
+++ trunk/src/balsa-message.h	Thu Feb 26 04:58:24 2009
@@ -23,6 +23,7 @@
 #define __BALSA_MESSAGE_H__
 
 #include "libbalsa.h"
+#include "balsa-app.h"
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/src/balsa-mime-widget-callbacks.c
==============================================================================
--- trunk/src/balsa-mime-widget-callbacks.c	(original)
+++ trunk/src/balsa-mime-widget-callbacks.c	Thu Feb 26 04:58:24 2009
@@ -19,14 +19,17 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-callbacks.h"
+
 #include <string.h>
-#include "config.h"
 #include "balsa-app.h"
 #include <glib/gi18n.h>
 #include "libbalsa-vfs.h"
 #include "balsa-message.h"
 #include "balsa-mime-widget.h"
-#include "balsa-mime-widget-callbacks.h"
 
 #include <gdk/gdkkeysyms.h>
 

Modified: trunk/src/balsa-mime-widget-callbacks.h
==============================================================================
--- trunk/src/balsa-mime-widget-callbacks.h	(original)
+++ trunk/src/balsa-mime-widget-callbacks.h	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,6 @@
 #ifndef __BALSA_MIME_WIDGET_CALLBACKS_H__
 #define __BALSA_MIME_WIDGET_CALLBACKS_H__
 
-#include "config.h"
 #include "balsa-app.h"
 #include "balsa-message.h"
 

Modified: trunk/src/balsa-mime-widget-crypto.c
==============================================================================
--- trunk/src/balsa-mime-widget-crypto.c	(original)
+++ trunk/src/balsa-mime-widget-crypto.c	Thu Feb 26 04:58:24 2009
@@ -19,14 +19,16 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-crypto.h"
 
 #ifdef HAVE_GPGME
 #include "balsa-app.h"
 #include "balsa-icons.h"
 #include <glib/gi18n.h>
 #include "balsa-mime-widget.h"
-#include "balsa-mime-widget-crypto.h"
 
 
 #ifdef HAVE_GPG

Modified: trunk/src/balsa-mime-widget-crypto.h
==============================================================================
--- trunk/src/balsa-mime-widget-crypto.h	(original)
+++ trunk/src/balsa-mime-widget-crypto.h	Thu Feb 26 04:58:24 2009
@@ -22,8 +22,6 @@
 #ifndef __BALSA_MIME_WIDGET_CRYPTO_H__
 #define __BALSA_MIME_WIDGET_CRYPTO_H__
 
-#include "config.h"
-
 #ifdef HAVE_GPGME
 
 #include "balsa-app.h"

Modified: trunk/src/balsa-mime-widget-image.c
==============================================================================
--- trunk/src/balsa-mime-widget-image.c	(original)
+++ trunk/src/balsa-mime-widget-image.c	Thu Feb 26 04:58:24 2009
@@ -19,12 +19,15 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-image.h"
+
 #include "balsa-app.h"
 #include <glib/gi18n.h>
 #include "balsa-mime-widget.h"
 #include "balsa-mime-widget-callbacks.h"
-#include "balsa-mime-widget-image.h"
 
 
 static gboolean balsa_image_button_press_cb(GtkWidget * widget, GdkEventButton * event,

Modified: trunk/src/balsa-mime-widget-message.c
==============================================================================
--- trunk/src/balsa-mime-widget-message.c	(original)
+++ trunk/src/balsa-mime-widget-message.c	Thu Feb 26 04:58:24 2009
@@ -19,6 +19,11 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-message.h"
+
 #include <string.h>
 #include <gtk/gtk.h>
 
@@ -26,7 +31,6 @@
 #include <libgnome/gnome-url.h>
 #endif
 
-#include "config.h"
 #include "balsa-app.h"
 #include "balsa-icons.h"
 #include "send.h"
@@ -34,7 +38,6 @@
 #include <glib/gi18n.h>
 #include "balsa-mime-widget.h"
 #include "balsa-mime-widget-callbacks.h"
-#include "balsa-mime-widget-message.h"
 #include "sendmsg-window.h"
 
 typedef enum _rfc_extbody_t {

Modified: trunk/src/balsa-mime-widget-multipart.c
==============================================================================
--- trunk/src/balsa-mime-widget-multipart.c	(original)
+++ trunk/src/balsa-mime-widget-multipart.c	Thu Feb 26 04:58:24 2009
@@ -19,12 +19,15 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-multipart.h"
+
 #include "balsa-app.h"
 #include <glib/gi18n.h>
 #include "balsa-mime-widget.h"
 #include "balsa-mime-widget-crypto.h"
-#include "balsa-mime-widget-multipart.h"
 
 
 BalsaMimeWidget *

Modified: trunk/src/balsa-mime-widget-text.c
==============================================================================
--- trunk/src/balsa-mime-widget-text.c	(original)
+++ trunk/src/balsa-mime-widget-text.c	Thu Feb 26 04:58:24 2009
@@ -19,9 +19,13 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-text.h"
+
 #include <string.h>
 #include <stdlib.h>
-#include "config.h"
 #include "balsa-app.h"
 #include "html.h"
 #include <glib/gi18n.h>
@@ -30,7 +34,6 @@
 #include "store-address.h"
 #include "balsa-mime-widget.h"
 #include "balsa-mime-widget-callbacks.h"
-#include "balsa-mime-widget-text.h"
 #include "balsa-cite-bar.h"
 
 #if !GTK_CHECK_VERSION(2, 14, 0)

Modified: trunk/src/balsa-mime-widget-vcalendar.c
==============================================================================
--- trunk/src/balsa-mime-widget-vcalendar.c	(original)
+++ trunk/src/balsa-mime-widget-vcalendar.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-vcalendar.h"
+
 #include "libbalsa.h"
 #include "rfc2445.h"
 #include "send.h"
@@ -27,7 +31,6 @@
 #include <glib/gi18n.h>
 #include "balsa-mime-widget.h"
 #include "balsa-mime-widget-callbacks.h"
-#include "balsa-mime-widget-vcalendar.h"
 
 
 static GtkWidget *balsa_vevent_widget(LibBalsaVEvent * event,

Modified: trunk/src/balsa-mime-widget.c
==============================================================================
--- trunk/src/balsa-mime-widget.c	(original)
+++ trunk/src/balsa-mime-widget.c	Thu Feb 26 04:58:24 2009
@@ -19,14 +19,15 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-mime-widget-image.h"
+
 #include <string.h>
-#include "config.h"
-#include "libbalsa.h"
-#include "balsa-app.h"
 #include "balsa-icons.h"
 #include "mime-stream-shared.h"
 #include <glib/gi18n.h>
-#include "balsa-mime-widget-image.h"
 #include "balsa-mime-widget-message.h"
 #include "balsa-mime-widget-multipart.h"
 #include "balsa-mime-widget-text.h"

Modified: trunk/src/balsa-print-object-default.c
==============================================================================
--- trunk/src/balsa-print-object-default.c	(original)
+++ trunk/src/balsa-print-object-default.c	Thu Feb 26 04:58:24 2009
@@ -19,12 +19,15 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-print-object-default.h"
+
 #include <gtk/gtk.h>
-#include "config.h"
 #include <glib/gi18n.h>
 #include "balsa-print-object.h"
 #include "libbalsa-vfs.h"
-#include "balsa-print-object-default.h"
 
 
 /* object related functions */

Modified: trunk/src/balsa-print-object-header.c
==============================================================================
--- trunk/src/balsa-print-object-header.c	(original)
+++ trunk/src/balsa-print-object-header.c	Thu Feb 26 04:58:24 2009
@@ -19,13 +19,16 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-print-object-header.h"
+
 #include <gtk/gtk.h>
-#include "config.h"
 #include <glib/gi18n.h>
 #include "balsa-print-object.h"
 #include "balsa-print-object-decor.h"
 #include "balsa-print-object-default.h"
-#include "balsa-print-object-header.h"
 
 
 /* object related functions */

Modified: trunk/src/balsa-print-object-header.h
==============================================================================
--- trunk/src/balsa-print-object-header.h	(original)
+++ trunk/src/balsa-print-object-header.h	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,6 @@
 #ifndef __BALSA_PRINT_OBJECT_HEADER_H__
 #define __BALSA_PRINT_OBJECT_HEADER_H__
 
-#include "config.h"
 #include "balsa-print-object.h"
 
 G_BEGIN_DECLS

Modified: trunk/src/balsa-print-object-text.c
==============================================================================
--- trunk/src/balsa-print-object-text.c	(original)
+++ trunk/src/balsa-print-object-text.c	Thu Feb 26 04:58:24 2009
@@ -19,9 +19,13 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-print-object-text.h"
+
 #include <gtk/gtk.h>
 #include <string.h>
-#include "config.h"
 #include <glib/gi18n.h>
 #include "libbalsa.h"
 #include "rfc2445.h"
@@ -29,7 +33,6 @@
 #include "balsa-print-object.h"
 #include "balsa-print-object-decor.h"
 #include "balsa-print-object-default.h"
-#include "balsa-print-object-text.h"
 
 
 typedef enum {

Modified: trunk/src/balsa-print-object.c
==============================================================================
--- trunk/src/balsa-print-object.c	(original)
+++ trunk/src/balsa-print-object.c	Thu Feb 26 04:58:24 2009
@@ -19,9 +19,13 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "balsa-print-object.h"
+
 #include <gtk/gtk.h>
 #include <libbalsa.h>
-#include "config.h"
 #include "balsa-app.h"
 #include "balsa-message.h"
 #include "balsa-print-object-decor.h"
@@ -29,7 +33,6 @@
 #include "balsa-print-object-header.h"
 #include "balsa-print-object-image.h"
 #include "balsa-print-object-text.h"
-#include "balsa-print-object.h"
 
 
 /* object related functions */

Modified: trunk/src/balsa-print-object.h
==============================================================================
--- trunk/src/balsa-print-object.h	(original)
+++ trunk/src/balsa-print-object.h	Thu Feb 26 04:58:24 2009
@@ -24,7 +24,6 @@
 
 #include <gtk/gtk.h>
 #include <libbalsa.h>
-#include "config.h"
 #include "balsa-app.h"
 #include "balsa-message.h"
 

Modified: trunk/src/filter-edit-callbacks.c
==============================================================================
--- trunk/src/filter-edit-callbacks.c	(original)
+++ trunk/src/filter-edit-callbacks.c	Thu Feb 26 04:58:24 2009
@@ -23,7 +23,9 @@
  * Callbacks for the filter edit dialog
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 /* yellow dog has crappy libc and needs pthread.h to be included here */
 #ifdef BALSA_USE_THREADS

Modified: trunk/src/filter-edit-dialog.c
==============================================================================
--- trunk/src/filter-edit-dialog.c	(original)
+++ trunk/src/filter-edit-dialog.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include "balsa-app.h"
 #include "filter-edit.h"

Modified: trunk/src/filter-export-callbacks.c
==============================================================================
--- trunk/src/filter-export-callbacks.c	(original)
+++ trunk/src/filter-export-callbacks.c	Thu Feb 26 04:58:24 2009
@@ -27,7 +27,9 @@
  * FIXME : should have a combo box for mailbox name when selecting a move or copy action
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include "balsa-app.h"
 #include "filter-export.h"

Modified: trunk/src/filter-export-dialog.c
==============================================================================
--- trunk/src/filter-export-dialog.c	(original)
+++ trunk/src/filter-export-dialog.c	Thu Feb 26 04:58:24 2009
@@ -27,10 +27,12 @@
  * FIXME : should have a combo box for mailbox name when selecting a move or copy action
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "filter-export.h"
 
 #include "balsa-app.h"
-#include "filter-export.h"
 
 #include <glib/gi18n.h>	/* Must come after balsa-app.h. */
 

Modified: trunk/src/filter-run-callbacks.c
==============================================================================
--- trunk/src/filter-run-callbacks.c	(original)
+++ trunk/src/filter-run-callbacks.c	Thu Feb 26 04:58:24 2009
@@ -23,7 +23,9 @@
  * Callbacks for the filter run dialog
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <string.h>
 

Modified: trunk/src/filter-run-dialog.c
==============================================================================
--- trunk/src/filter-run-dialog.c	(original)
+++ trunk/src/filter-run-dialog.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

Modified: trunk/src/folder-conf.c
==============================================================================
--- trunk/src/folder-conf.c	(original)
+++ trunk/src/folder-conf.c	Thu Feb 26 04:58:24 2009
@@ -19,11 +19,14 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "folder-conf.h"
+
 #include <string.h>
 #include "balsa-app.h"
 #include "balsa-icons.h"
-#include "folder-conf.h"
 #include "mailbox-conf.h"
 #include "mailbox-node.h"
 #include "save-restore.h"

Modified: trunk/src/information-dialog.c
==============================================================================
--- trunk/src/information-dialog.c	(original)
+++ trunk/src/information-dialog.c	Thu Feb 26 04:58:24 2009
@@ -24,14 +24,15 @@
  * received from libbalsa
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "information-dialog.h"
 
 #include <string.h>
 
-#include "libbalsa.h"
 #include <glib/gi18n.h>
 #include "balsa-app.h"
-#include "information-dialog.h"
 
 static void balsa_information_bar(GtkWindow *parent,
                                   LibBalsaInformationType type,

Modified: trunk/src/information-dialog.h
==============================================================================
--- trunk/src/information-dialog.h	(original)
+++ trunk/src/information-dialog.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,8 @@
 #ifndef __INFORMATION_DIALOG_H__
 #define __INFORMATION_DIALOG_H__
 
+#include "libbalsa.h"
+
 typedef enum _BalsaInformationShow BalsaInformationShow;
 enum _BalsaInformationShow {
     BALSA_INFORMATION_SHOW_NONE = 0,

Modified: trunk/src/mailbox-conf.c
==============================================================================
--- trunk/src/mailbox-conf.c	(original)
+++ trunk/src/mailbox-conf.c	Thu Feb 26 04:58:24 2009
@@ -39,14 +39,16 @@
    The mailbox_name field is displayed only for special mailboxes
    and POP3 mailboxes.
 */
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "mailbox-conf.h"
 
 #include <gtk/gtk.h>
 #include <string.h>
 
 #include "balsa-app.h"
 #include "balsa-mblist.h"
-#include "mailbox-conf.h"
 #include "mailbox-node.h"
 #include "pref-manager.h"
 #include "save-restore.h"

Modified: trunk/src/mailbox-node.c
==============================================================================
--- trunk/src/mailbox-node.c	(original)
+++ trunk/src/mailbox-node.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "mailbox-node.h"
 
 #include <unistd.h>
 #include <string.h>
@@ -28,7 +31,6 @@
 #include "folder-scanners.h"
 #include "folder-conf.h"
 #include "mailbox-conf.h"
-#include "mailbox-node.h"
 #include "save-restore.h"
 #include "filter.h"
 #include "imap-server.h"

Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c	(original)
+++ trunk/src/main-window.c	Thu Feb 26 04:58:24 2009
@@ -27,7 +27,9 @@
  * more self-contained.  pb
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "main-window.h"
 
 #include <string.h>

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 
 #if HAVE_GNOME
 #include <gnome.h>

Modified: trunk/src/message-window.c
==============================================================================
--- trunk/src/message-window.c	(original)
+++ trunk/src/message-window.c	Thu Feb 26 04:58:24 2009
@@ -19,9 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "message-window.h"
+
 #include "balsa-app.h"
 #include "balsa-message.h"
 #include "balsa-icons.h"

Modified: trunk/src/pref-manager.c
==============================================================================
--- trunk/src/pref-manager.c	(original)
+++ trunk/src/pref-manager.c	Thu Feb 26 04:58:24 2009
@@ -20,10 +20,13 @@
  */
 
 /* MAKE SURE YOU USE THE HELPER FUNCTIONS, like create_table(, page), etc. */
-#include "config.h"
 
-#include "balsa-app.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
 #include "pref-manager.h"
+
+#include "balsa-app.h"
 #include "mailbox-conf.h"
 #include "folder-conf.h"
 #include "main-window.h"

Modified: trunk/src/pref-manager.h
==============================================================================
--- trunk/src/pref-manager.h	(original)
+++ trunk/src/pref-manager.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,7 @@
 #ifndef __PREF_MANAGER_H__
 #define __PREF_MANAGER_H__
 
+#include <gtk/gtk.h>
 
 /* open the preferences manager window */
 void open_preferences_manager(GtkWidget * widget, gpointer data);

Modified: trunk/src/print-gtk.c
==============================================================================
--- trunk/src/print-gtk.c	(original)
+++ trunk/src/print-gtk.c	Thu Feb 26 04:58:24 2009
@@ -19,9 +19,12 @@
  * 02111-1307, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+
 #include <string.h>
 #include <gtk/gtk.h>
-#include "config.h"
 #include "balsa-app.h"
 #include "print.h"
 #include "misc.h"

Modified: trunk/src/print.c
==============================================================================
--- trunk/src/print.c	(original)
+++ trunk/src/print.c	Thu Feb 26 04:58:24 2009
@@ -19,13 +19,14 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "print.h"
 
 #include <gnome.h>
 #include "balsa-app.h"
 
-#include "print.h"
 #include "misc.h"
 #include "balsa-message.h"
 

Modified: trunk/src/print.h
==============================================================================
--- trunk/src/print.h	(original)
+++ trunk/src/print.h	Thu Feb 26 04:58:24 2009
@@ -22,8 +22,6 @@
 #ifndef __PRINT_H__
 #define __PRINT_H__
 
-#include "config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif				/* __cplusplus */

Modified: trunk/src/quote-color.c
==============================================================================
--- trunk/src/quote-color.c	(original)
+++ trunk/src/quote-color.c	Thu Feb 26 04:58:24 2009
@@ -19,10 +19,12 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "quote-color.h"
 
 #include "balsa-app.h"
-#include "quote-color.h"
 
 
 /*

Modified: trunk/src/quote-color.h
==============================================================================
--- trunk/src/quote-color.h	(original)
+++ trunk/src/quote-color.h	Thu Feb 26 04:58:24 2009
@@ -26,10 +26,11 @@
 extern "C" {
 #endif				/* __cplusplus */
 
+#include <gtk/gtk.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "config.h"
 
 #if !USE_GREGEX
 #  ifdef HAVE_PCRE

Modified: trunk/src/save-restore.c
==============================================================================
--- trunk/src/save-restore.c	(original)
+++ trunk/src/save-restore.c	Thu Feb 26 04:58:24 2009
@@ -18,8 +18,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
  * 02111-1307, USA.
  */
-#include "config.h"
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "save-restore.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -28,7 +31,6 @@
 #endif
 #include <glib/gi18n.h>
 #include "balsa-app.h"
-#include "save-restore.h"
 #include "server.h"
 #include "quote-color.h"
 #include "toolbar-prefs.h"

Modified: trunk/src/save-restore.h
==============================================================================
--- trunk/src/save-restore.h	(original)
+++ trunk/src/save-restore.h	Thu Feb 26 04:58:24 2009
@@ -22,7 +22,6 @@
 #ifndef __SAVE_RESTORE_H__
 #define __SAVE_RESTORE_H__
 
-#include "config.h"
 #include "libbalsa.h"
 #include "mailbox-node.h"
 

Modified: trunk/src/sendmsg-window.c
==============================================================================
--- trunk/src/sendmsg-window.c	(original)
+++ trunk/src/sendmsg-window.c	Thu Feb 26 04:58:24 2009
@@ -24,8 +24,10 @@
 */
 
 
-#include "config.h"
-
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "sendmsg-window.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -79,7 +81,6 @@
 #endif
 
 #include "missing.h"
-#include "sendmsg-window.h"
 #include "ab-window.h"
 #include "address-view.h"
 #include "print.h"
@@ -88,7 +89,6 @@
 #else                           /* HAVE_GTKSPELL */
 #include "spell-check.h"
 #endif                          /* HAVE_GTKSPELL */
-#include "toolbar-factory.h"
 #if HAVE_GTKSOURCEVIEW
 #include <gtksourceview/gtksourceview.h>
 #endif                          /* HAVE_GTKSOURCEVIEW */

Modified: trunk/src/sendmsg-window.h
==============================================================================
--- trunk/src/sendmsg-window.h	(original)
+++ trunk/src/sendmsg-window.h	Thu Feb 26 04:58:24 2009
@@ -26,7 +26,9 @@
 extern "C" {
 #endif				/* __cplusplus */
 
+#include "libbalsa.h"
 #include "address-view.h"
+#include "toolbar-factory.h"
 
     typedef enum {
        SEND_NORMAL,            /* initialized by Compose */

Modified: trunk/src/spell-check.c
==============================================================================
--- trunk/src/spell-check.c	(original)
+++ trunk/src/spell-check.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "spell-check.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS
 
@@ -43,7 +46,6 @@
 
 #include "balsa-app.h"
 #include "quote-color.h"
-#include "spell-check.h"
 #include "balsa-icons.h"
 
 #define SPELLMGR_CODESET "UTF-8"

Modified: trunk/src/spell-check.h
==============================================================================
--- trunk/src/spell-check.h	(original)
+++ trunk/src/spell-check.h	Thu Feb 26 04:58:24 2009
@@ -22,8 +22,6 @@
 #ifndef __BALSA_SPELL_CHECK_H__
 #define __BALSA_SPELL_CHECK_H__
 
-#include "config.h"
-
 #define USE_ORIGINAL_MANAGER_FUNCS
 
 #ifdef __cplusplus

Modified: trunk/src/store-address.c
==============================================================================
--- trunk/src/store-address.c	(original)
+++ trunk/src/store-address.c	Thu Feb 26 04:58:24 2009
@@ -19,15 +19,15 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "store-address.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
 
 #include "balsa-app.h"
-#include "store-address.h"
-
-#include "libbalsa.h"
 
 /* global data */
 typedef struct _StoreAddressInfo StoreAddressInfo;

Modified: trunk/src/store-address.h
==============================================================================
--- trunk/src/store-address.h	(original)
+++ trunk/src/store-address.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,9 @@
 #ifndef __STORE_ADDRESS_DIALOG_H__
 #define __STORE_ADDRESS_DIALOG_H__
 
+#include <glib.h>
+#include "libbalsa.h"
+
 void balsa_store_address_from_messages(GList * messages);
 void balsa_store_address(const LibBalsaAddress *address);
 

Modified: trunk/src/toolbar-factory.c
==============================================================================
--- trunk/src/toolbar-factory.c	(original)
+++ trunk/src/toolbar-factory.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "toolbar-factory.h"
 
 #include <string.h>
 #if HAVE_GNOME
@@ -36,7 +39,6 @@
 #include "libbalsa-conf.h"
 
 #include "toolbar-prefs.h"
-#include "toolbar-factory.h"
 
 /* Must be consistent with BalsaToolbarType enum: */
 static const gchar *const balsa_toolbar_names[] =

Modified: trunk/src/toolbar-factory.h
==============================================================================
--- trunk/src/toolbar-factory.h	(original)
+++ trunk/src/toolbar-factory.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,9 @@
 #ifndef __TOOLBAR_FACTORY_H__
 #define __TOOLBAR_FACTORY_H__
 
+#include <glib-object.h>
+#include "toolbar-prefs.h"
+
 GType balsa_toolbar_model_get_type(void);
 
 #define BALSA_TYPE_TOOLBAR_MODEL \

Modified: trunk/src/toolbar-prefs.c
==============================================================================
--- trunk/src/toolbar-prefs.c	(original)
+++ trunk/src/toolbar-prefs.c	Thu Feb 26 04:58:24 2009
@@ -19,7 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include "config.h"
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+# include "config.h"
+#endif                          /* HAVE_CONFIG_H */
+#include "toolbar-prefs.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
@@ -30,7 +33,6 @@
 #include "message-window.h"
 #include "sendmsg-window.h"
 #include "toolbar-factory.h"
-#include "toolbar-prefs.h"
 
 #if !GTK_CHECK_VERSION(2, 14, 0)
 #ifdef HAVE_GNOME

Modified: trunk/src/toolbar-prefs.h
==============================================================================
--- trunk/src/toolbar-prefs.h	(original)
+++ trunk/src/toolbar-prefs.h	Thu Feb 26 04:58:24 2009
@@ -22,6 +22,8 @@
 #ifndef __TOOLBAR_PREFS_H__
 #define __TOOLBAR_PREFS_H__
 
+#include <gtk/gtk.h>
+
 int get_toolbar_button_index(const char *id);
 
 void customize_dialog_cb(GtkWidget *, gpointer);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]