Bug #646109 - Fix use of include <config.h> to make sure translations work

37 files changed, 116 insertions, 12 deletions

diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 786fda255c..17a7ae1421 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-attachment-bar.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 11362e5d58..0ae8706a32 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-backend.h"
 
 #include <string.h>
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 3678092a62..e24e69534e 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-browser.h"
 
 #include <string.h>
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 78a63248bc..ed88fec808 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -19,9 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-display.h"
 
-#include <config.h>
 #include <glib/gi18n.h>
 
 #include "e-util/e-util.h"
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 0e55fc5653..e9aa02928d 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-folder-pane.h"
 
 #include <string.h>
diff --git a/mail/e-mail-folder-utils.c b/mail/e-mail-folder-utils.c
index f621d7464d..659d51e02e 100644
--- a/mail/e-mail-folder-utils.c
+++ b/mail/e-mail-folder-utils.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-folder-utils.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include "mail/mail-tools.h"
diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c
index f83055bb34..0eb1dc9a91 100644
--- a/mail/e-mail-label-action.c
+++ b/mail/e-mail-label-action.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-action.h"
 
 struct _EMailLabelActionPrivate {
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index 534ab9e705..cb29cc6932 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-dialog.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index c0774e4f52..f604893bb3 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-list-store.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index 0a210178aa..e5fd6ebcc2 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-manager.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-label-tree-view.c b/mail/e-mail-label-tree-view.c
index 0d5baab145..e5a8e50832 100644
--- a/mail/e-mail-label-tree-view.c
+++ b/mail/e-mail-label-tree-view.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-label-tree-view.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-local.c b/mail/e-mail-local.c
index 46acb9f5b5..cebbd4dadb 100644
--- a/mail/e-mail-local.c
+++ b/mail/e-mail-local.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-local.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-message-pane.c b/mail/e-mail-message-pane.c
index 0a23429cf3..e77974b8eb 100644
--- a/mail/e-mail-message-pane.c
+++ b/mail/e-mail-message-pane.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-message-pane.h"
 
 #include <string.h>
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index de74f8175e..6fef0b9a69 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-migrate.h"
 
 #include <stdio.h>
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 74b9eadf2d..895f0a91f4 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/mail/e-mail-pane.c b/mail/e-mail-pane.c
index ca25d817cd..2ed275aaca 100644
--- a/mail/e-mail-pane.c
+++ b/mail/e-mail-pane.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 6d381009d6..f562bee5b1 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include <glib.h>
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 1fe121dcb7..178b6aefcf 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -21,6 +21,10 @@
 
 /* Miscellaneous utility functions used by EMailReader actions. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-reader-utils.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 91e303ec46..9d32ddb335 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-reader.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index 2baf2632a0..573fd5fb18 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-session-utils.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include <mail/mail-tools.h>
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 05f0fa09b9..ffcfc2ea37 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -25,7 +25,9 @@
 
 /* mail-session.c: handles the session information and resource manipulation */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index 5f6285112d..32edd0e4eb 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-sidebar.h"
 
 #include <string.h>
diff --git a/mail/e-mail-store-utils.c b/mail/e-mail-store-utils.c
index 52aecdcc0d..c0d2466216 100644
--- a/mail/e-mail-store-utils.c
+++ b/mail/e-mail-store-utils.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-store-utils.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 typedef struct _AsyncContext AsyncContext;
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 7a9c74cc8a..08c676d618 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-mail-store.h"
 
 #include <glib/gi18n.h>
diff --git a/mail/e-mail-tab-picker.c b/mail/e-mail-tab-picker.c
index b6ad1c753b..5bf173253a 100644
--- a/mail/e-mail-tab-picker.c
+++ b/mail/e-mail-tab-picker.c
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "e-mail-tab-picker.h"
diff --git a/mail/e-mail-tab.c b/mail/e-mail-tab.c
index 04d0aa2645..213e545da7 100644
--- a/mail/e-mail-tab.c
+++ b/mail/e-mail-tab.c
@@ -17,7 +17,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <math.h>
diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c
index d1a3503329..90c74d7299 100644
--- a/mail/e-mail-view.c
+++ b/mail/e-mail-view.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 
 #include "e-mail-view.h"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index b01b30550c..0ff74c0fa7 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 72cd4ccf70..1a04a3437c 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "em-folder-tree-model.h"
 
 #include <stdio.h>
diff --git a/mail/em-junk.c b/mail/em-junk.c
index 6af215ed7a..1026e4d76a 100644
--- a/mail/em-junk.c
+++ b/mail/em-junk.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "em-junk.h"
 
 GQuark
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index d2027dc01b..db52c31a6c 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -16,9 +16,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "em-subscription-editor.h"
 
-#include <config.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index dcfa9d78f7..f87819ee9d 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -29,7 +29,7 @@
  **/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 53ff132545..24c54c7290 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -15,7 +15,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 988c9fadcb..fdf8472cf6 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -25,7 +25,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <errno.h>
 
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 7e4441a8de..7c7708b350 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 526e0ea1ad..12ddb0ecf3 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -20,7 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <string.h>
 
 #include <glib.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 9adf2b4776..5bcef28cfc 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>