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.

30 files changed, 0 insertions, 60 deletions

diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index b3dc0ac63..c3c489702 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -24,9 +24,7 @@
    $Id$
 */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "eel-gconf-extensions.h"
 
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 0e7bc7d5e..381ed8670 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "egg-editable-toolbar.h"
 #include "egg-toolbars-model.h"
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index 0d91878e7..c4c30880f 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "egg-toolbars-model.h"
 #include "eggmarshalers.h"
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index b2a4c5a4b..6ec0565c2 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-debug.h"
 
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 0be7f73bc..f2311e49b 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -21,9 +21,7 @@
 #ifndef EPHY_DEBUG_H
 #define EPHY_DEBUG_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index bf76ba069..dd13715ff 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-dialog.h"
 #include "ephy-glade.h"
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index fa2a7cf78..6ff9cff16 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-dnd.h"
 #include "ephy-string.h"
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 7c933a3a5..b9bccc588 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-file-chooser.h"
 #include "ephy-file-helpers.h"
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 49f4c487d..fb6e3ac1f 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/ephy-glade.c b/lib/ephy-glade.c
index 5cd521a77..ce91c9954 100644
--- a/lib/ephy-glade.c
+++ b/lib/ephy-glade.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-glade.h"
 
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 39f72b9d3..de4d3abdc 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-gui.h"
 #include "eel-gconf-extensions.h"
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index b2282472a..ff05c34e1 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-langs.h"
 
diff --git a/lib/ephy-loader.c b/lib/ephy-loader.c
index d4b1a0375..9d682caa9 100644
--- a/lib/ephy-loader.c
+++ b/lib/ephy-loader.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-loader.h"
 
diff --git a/lib/ephy-module.c b/lib/ephy-module.c
index 95f9a587e..fe31e39c6 100644
--- a/lib/ephy-module.c
+++ b/lib/ephy-module.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-module.h"
 #include "ephy-file-helpers.h"
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 09c6272c4..3774b63fd 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-node-db.h"
 #include "ephy-file-helpers.h"
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index fd270b636..6e87a471e 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 3a6ec2480..1a8e53292 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff --git a/lib/ephy-shlib-loader.c b/lib/ephy-shlib-loader.c
index 5877ee341..f5b759b64 100644
--- a/lib/ephy-shlib-loader.c
+++ b/lib/ephy-shlib-loader.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-shlib-loader.h"
 #include "ephy-loader.h"
diff --git a/lib/ephy-state.c b/lib/ephy-state.c
index 04fa76d83..452d56b7b 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-state.c
@@ -20,9 +20,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-state.h"
 #include "ephy-file-helpers.h"
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 566c2e37c..8665aa1ec 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtk.h>
 #include <glib.h>
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index dbda76275..e3095c376 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-string.h"
 
diff --git a/lib/ephy-zoom.c b/lib/ephy-zoom.c
index 2e3a15a4a..b6cf8c68b 100644
--- a/lib/ephy-zoom.c
+++ b/lib/ephy-zoom.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-zoom.h"
 
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 451efb507..100af8f58 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -21,9 +21,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-tree-model-node.h"
 #include "ephy-location-entry.h"
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 2ef02b648..2a0ec2d6f 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeviewcolumn.h>
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index 0c4469e32..3212ad767 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtklabel.h>
 #include <glib/gi18n.h>
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index 13a9d80d7..fc0fbcc7a 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -28,9 +28,7 @@
  * $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-spinner.h"
 #include "ephy-debug.h"
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 60355eaf7..487c9aa38 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <time.h>
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index df5f9533c..d088f524f 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <gtk/gtkmarshal.h>
 #include <gtk/gtktreednd.h>
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 20e360e89..b23a0b379 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -19,9 +19,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-zoom-action.h"
 #include "ephy-zoom-control.h"
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index 644401ea0..c201a4da0 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.c
@@ -18,9 +18,7 @@
  *  $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "ephy-zoom-control.h"
 #include "ephy-marshal.h"