We always have config.h, no need to guard its inclusion.

2004-11-02  Christian Persch  <chpe@cvs.gnome.org>

	* embed/downloader-view.c:
	* embed/ephy-command-manager.c:
	* embed/ephy-cookie-manager.c:
	* embed/ephy-download.c:
	* embed/ephy-embed-dialog.c:
	* embed/ephy-embed-event.c:
	* embed/ephy-embed-factory.c:
	* embed/ephy-embed-persist.c:
	* embed/ephy-embed-shell.c:
	* embed/ephy-embed-single.c:
	* embed/ephy-embed.c:
	* embed/ephy-encodings.c:
	* embed/ephy-favicon-cache.c:
	* embed/ephy-history.c:
	* embed/ephy-password-manager.c:
	* embed/ephy-permission-manager.c:
	* embed/find-dialog.c:
	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/ContentHandler.h:
	* embed/mozilla/EphyAboutRedirector.cpp:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/EphyContentPolicy.cpp:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/EphySingle.cpp:
	* embed/mozilla/EphyUtils.cpp:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/GlobalHistory.cpp:
	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/MozDownload.h:
	* embed/mozilla/MozRegisterComponents.cpp:
	* embed/mozilla/PrintingPromptService.cpp:
	* embed/mozilla/mozilla-download.cpp:
	* embed/mozilla/mozilla-embed-event.cpp:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* embed/print-dialog.c:
	* lib/eel-gconf-extensions.c:
	* lib/egg/egg-editable-toolbar.c:
	* lib/egg/egg-toolbars-model.c:
	* lib/ephy-debug.c:
	* lib/ephy-debug.h:
	* lib/ephy-dialog.c:
	* lib/ephy-dnd.c:
	* lib/ephy-file-chooser.c:
	* lib/ephy-file-helpers.c:
	* lib/ephy-glade.c:
	* lib/ephy-gui.c:
	* lib/ephy-langs.c:
	* lib/ephy-loader.c:
	* lib/ephy-module.c:
	* lib/ephy-node-db.c:
	* lib/ephy-node-filter.c:
	* lib/ephy-node.c:
	* lib/ephy-shlib-loader.c:
	* lib/ephy-state.c:
	* lib/ephy-stock-icons.c:
	* lib/ephy-string.c:
	* lib/ephy-zoom.c:
	* lib/widgets/ephy-location-entry.c:
	* lib/widgets/ephy-node-view.c:
	* lib/widgets/ephy-search-entry.c:
	* lib/widgets/ephy-spinner.c:
	* lib/widgets/ephy-tree-model-node.c:
	* lib/widgets/ephy-tree-model-sort.c:
	* lib/widgets/ephy-zoom-action.c:
	* lib/widgets/ephy-zoom-control.c:
	* src/bookmarks/ephy-bookmark-action.c:
	* src/bookmarks/ephy-bookmark-properties.c:
	* src/bookmarks/ephy-bookmarks-editor.c:
	* src/bookmarks/ephy-bookmarks-export.c:
	* src/bookmarks/ephy-bookmarks-import.c:
	* src/bookmarks/ephy-bookmarks-menu.c:
	* src/bookmarks/ephy-bookmarks.c:
	* src/bookmarks/ephy-bookmarksbar-model.c:
	* src/bookmarks/ephy-bookmarksbar.c:
	* src/bookmarks/ephy-favorites-menu.c:
	* src/bookmarks/ephy-new-bookmark.c:
	* src/bookmarks/ephy-topic-action.c:
	* src/bookmarks/ephy-topics-selector.c:
	* src/ephy-automation.c:
	* src/ephy-completion-model.c:
	* src/ephy-encoding-dialog.c:
	* src/ephy-encoding-menu.c:
	* src/ephy-extension.c:
	* src/ephy-extensions-manager.c:
	* src/ephy-favicon-action.c:
	* src/ephy-go-action.c:
	* src/ephy-history-window.c:
	* src/ephy-location-action.c:
	* src/ephy-main.c:
	* src/ephy-navigation-action.c:
	* src/ephy-notebook.c:
	* src/ephy-session.c:
	* src/ephy-shell.c:
	* src/ephy-statusbar.c:
	* src/ephy-tab.c:
	* src/ephy-tabs-menu.c:
	* src/ephy-toolbars-model.c:
	* src/ephy-window.c:
	* src/pdm-dialog.c:
	* src/popup-commands.c:
	* src/ppview-toolbar.c:
	* src/prefs-dialog.c:
	* src/toolbar.c:
	* src/window-commands.c:

	We always have config.h, no need to guard its inclusion.

39 files changed, 0 insertions, 78 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 582a22fd8..a1e12f15b 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 878faa8e1..59b4bec2a 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-bookmarksbar-model.h"
 #include "ephy-bookmark-properties.h"
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index ed1903cd8..be2b5e715 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -18,9 +18,7 @@
  * $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index a1fc2ac06..72f5f05ae 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-bookmarks-export.h"
 #include "ephy-node-common.h"
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 391d4c2e9..52fb3386d 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include <libxml/HTMLtree.h>
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 75566ccdc..dfb3aea22 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-bookmarks-menu.h"
 #include "ephy-bookmark-action.h"
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index ef4e37e47..198d29a9b 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-bookmarks.h"
 #include "ephy-file-helpers.h"
diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c
index abe7dd16f..b1d49d981 100755
--- a/src/bookmarks/ephy-bookmarksbar-model.c
+++ b/src/bookmarks/ephy-bookmarksbar-model.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-bookmarksbar-model.h"
 #include "ephy-bookmarks.h"
diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index c143e6bc9..dce1a15be 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-bookmarksbar.h"
 #include "ephy-bookmarksbar-model.h"
diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c
index f3d79e43b..dce6e5561 100644
--- a/src/bookmarks/ephy-favorites-menu.c
+++ b/src/bookmarks/ephy-favorites-menu.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-favorites-menu.h"
 #include "ephy-bookmark-action.h"
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 82cb28dfd..d2813895c 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-new-bookmark.h"
 #include "ephy-state.h"
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 540bca442..17004b0b5 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtktoolitem.h>
 #include <glib/gi18n.h>
diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c
index b6d268c3a..2e2102c59 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-topics-selector.h"
 #include "ephy-debug.h"
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index aac78e81b..d87ad1372 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-automation.h"
 
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index 6a0966ba6..0e6c905fa 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-completion-model.h"
 #include "ephy-node.h"
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index bf5d16bb1..1afe804f5 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-encoding-dialog.h"
 #include "ephy-encodings.h"
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 1e48e795b..2f5ab540e 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-encoding-menu.h"
 #include "ephy-encoding-dialog.h"
diff --git a/src/ephy-extension.c b/src/ephy-extension.c
index 15f27d5cf..6b90876c4 100644
--- a/src/ephy-extension.c
+++ b/src/ephy-extension.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-extension.h"
 
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index 524a24496..b27502527 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-extensions-manager.h"
 
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index 95f14edb9..b8fdab189 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-favicon-action.h"
 #include "ephy-window.h"
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index 74fc2fdb5..9eaa5ed1d 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-go-action.h"
 #include "ephy-debug.h"
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 303ebc3a7..cdd9793a3 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 505a82b7e..b34ac0de7 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-location-action.h"
 #include "ephy-location-entry.h"
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 0f73fb266..7f8dc617b 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-shell.h"
 #include "ephy-file-helpers.h"
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index c49e4b78b..5f826d9bc 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-navigation-action.h"
 #include "ephy-window.h"
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index d4fafb810..e8e9b4541 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-notebook.h"
 #include "ephy-stock-icons.h"
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 0dc040070..cbe8e6190 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-session.h"
 
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 78ad65c59..49befe177 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-shell.h"
 #include "ephy-embed-shell.h"
diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index 2ff4a5e30..96117be26 100755
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-statusbar.h"
 #include "ephy-stock-icons.h"
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index f63e94ccd..94ce6cbfa 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -21,9 +21,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-tab.h"
 #include "eel-gconf-extensions.h"
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index 2ba5115dc..c207f4c95 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-tabs-menu.h"
 #include "ephy-string.h"
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index 48561fc2d..d8a5115b3 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-toolbars-model.h"
 #include "ephy-file-helpers.h"
diff --git a/src/ephy-window.c b/src/ephy-window.c
index bb5f7ad33..69016360e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-window.h"
 #include "ephy-command-manager.h"
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 97b3bd2f0..a6dfa8c77 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "pdm-dialog.h"
 #include "ephy-shell.h"
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 1e7f9e09c..953abea36 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "popup-commands.h"
 #include "ephy-shell.h"
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index fee8e5e4e..2474205f8 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ppview-toolbar.h"
 #include "ephy-window.h"
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 56f1369c7..06d3cb1f0 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "prefs-dialog.h"
 #include "ephy-dialog.h"
diff --git a/src/toolbar.c b/src/toolbar.c
index 2b8ffd3b7..9a7718b16 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "toolbar.h"
 #include "ephy-favicon-action.h"
diff --git a/src/window-commands.c b/src/window-commands.c
index e26969c0d..6f88248f5 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-embed-shell.h"
 #include "ephy-embed-single.h"