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

35 files changed, 110 insertions, 1 deletions

diff --git a/e-util/e-account-utils.c b/e-util/e-account-utils.c
index 0172abc553..ec733ed103 100644
--- a/e-util/e-account-utils.c
+++ b/e-util/e-account-utils.c
@@ -20,6 +20,10 @@
  * @include: e-util/e-account-utils.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-account-utils.h"
 
 #include <string.h>
diff --git a/e-util/e-activity.c b/e-util/e-activity.c
index 2e3a078f82..2c0ba6adf0 100644
--- a/e-util/e-activity.c
+++ b/e-util/e-activity.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-activity.h"
 
 #include <stdarg.h>
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 83ef05c68e..8696588ab2 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -21,6 +21,10 @@
  * Copyright (C) 2009 Intel Corporation
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-alert-dialog.h"
 
 #include "e-util.h"
diff --git a/e-util/e-alert-sink.c b/e-util/e-alert-sink.c
index 2a8db40afb..ae3a7361e1 100644
--- a/e-util/e-alert-sink.c
+++ b/e-util/e-alert-sink.c
@@ -25,6 +25,10 @@
  * usually by displaying them to the user.
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-alert-sink.h"
 
 #include "e-alert-dialog.h"
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 3554fd2709..5ef7c577e8 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index ad651314f5..476118284d 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 44d5dc2c6c..b8d772c9b5 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-categories-config.h"
 
 #include <string.h>
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 3748a470e0..8b354cf997 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 0948f2fb61..9a47e81fc4 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <string.h>
diff --git a/e-util/e-extensible.c b/e-util/e-extensible.c
index 909003f580..a7523deb21 100644
--- a/e-util/e-extensible.c
+++ b/e-util/e-extensible.c
@@ -56,6 +56,10 @@
  * </informalexample>
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-extensible.h"
 
 #include <e-util/e-util.h>
diff --git a/e-util/e-extension.c b/e-util/e-extension.c
index baf6b49fa4..88912bc8dd 100644
--- a/e-util/e-extension.c
+++ b/e-util/e-extension.c
@@ -39,6 +39,10 @@
  *    registered in the library module's e_module_load() function.
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-extension.h"
 
 struct _EExtensionPrivate {
diff --git a/e-util/e-file-utils.c b/e-util/e-file-utils.c
index 49fd4a07ee..f89bff6875 100644
--- a/e-util/e-file-utils.c
+++ b/e-util/e-file-utils.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index ceac32ffc6..e2cdd8f6b5 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index a374a6dcfe..afb879a4c2 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/e-util/e-import.c b/e-util/e-import.c
index b5fbe27f68..4b55895e66 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef HAVE_IMPORT_H
 #include <import.h>
 #endif
diff --git a/e-util/e-module.c b/e-util/e-module.c
index cc397a9001..b3e90aac72 100644
--- a/e-util/e-module.c
+++ b/e-util/e-module.c
@@ -25,6 +25,10 @@
  * @include: e-util/e-module.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-module.h"
 
 #include <glib/gi18n.h>
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index a6ecb834c8..745a931954 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -15,6 +15,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-plugin-ui.h"
 
 #include "e-util.h"
diff --git a/e-util/e-plugin-util.c b/e-util/e-plugin-util.c
index 4e04bc3c18..dbceeb67ce 100644
--- a/e-util/e-plugin-util.c
+++ b/e-util/e-plugin-util.c
@@ -16,6 +16,10 @@
  * Copyright (C) 1999-2010 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 17e4b50102..e0f1aecd22 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -16,7 +16,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <string.h>
diff --git a/e-util/e-poolv.c b/e-util/e-poolv.c
index acd0a1a452..b30149d617 100644
--- a/e-util/e-poolv.c
+++ b/e-util/e-poolv.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-poolv.h"
 
 #include <string.h>
diff --git a/e-util/e-print.c b/e-util/e-print.c
index dd5a56aa16..e50ffd8647 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-print.h"
 
 #include <stdio.h>
diff --git a/e-util/e-selection.c b/e-util/e-selection.c
index 3d8922a95a..1c5d11b6e4 100644
--- a/e-util/e-selection.c
+++ b/e-util/e-selection.c
@@ -25,6 +25,10 @@
  * @include: e-util/e-selection.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-selection.h"
 
 #include <string.h>
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index bb2029a32f..43c943ac05 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -21,9 +21,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-list.h"
 
-#include <config.h>
 #include <string.h>
 
 #include <libedataserver/e-uid.h>
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c
index 8c190791d5..fca51d3799 100644
--- a/e-util/e-signature-utils.c
+++ b/e-util/e-signature-utils.c
@@ -17,6 +17,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-signature-utils.h"
 
 #include <errno.h>
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 21d3838d96..074d45d639 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 74838e340d..9e255e89f2 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 554ea5fb1d..84e7c9e148 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 9e2b2d6474..e5624f917a 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 
diff --git a/e-util/e-ui-manager.c b/e-util/e-ui-manager.c
index 52196626d4..35e14a3ae6 100644
--- a/e-util/e-ui-manager.c
+++ b/e-util/e-ui-manager.c
@@ -25,6 +25,10 @@
  * which influences the parsing of UI definitions.
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-ui-manager.h"
 #include "e-util-private.h"
 
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index a287cd8236..de22525898 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/e-util/e-util.c b/e-util/e-util.c
index b7dd93aa15..4b47f64918 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -25,7 +25,9 @@
  * @include: e-util/e-util.h
  **/
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/e-util/e-win32-defaults.c b/e-util/e-win32-defaults.c
index 7fe216f5a0..a510ebf217 100644
--- a/e-util/e-win32-defaults.c
+++ b/e-util/e-win32-defaults.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <windows.h>
 
 #include "e-win32-defaults.h"
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index bfe903bbc4..86d1a533fa 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <windows.h>
 #include <string.h>
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 443f59fea9..0c34f48cb8 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 2207cab22d..9741f6c280 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -19,7 +19,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>