Change some more i18n inclusion and remove several unused includes.

2003-11-06  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/downloader-view.c:
        * embed/ephy-embed-popup-control.c:
        * embed/mozilla/ExternalProtocolService.cpp:
        * embed/mozilla/FilePicker.cpp:
        * embed/mozilla/GtkNSSDialogs.cpp:
        * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
        * embed/mozilla/mozilla-embed-single.cpp:
        * embed/mozilla/mozilla-notifiers.cpp:
        * lib/ephy-file-helpers.c:
        * lib/widgets/ephy-search-entry.c:

        Change some more i18n inclusion and remove several
        unused includes.

11 files changed, 26 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f666708f..acad62b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2003-11-06  Marco Pesenti Gritti  <marco@gnome.org>
 
+	* embed/downloader-view.c:
+	* embed/ephy-embed-popup-control.c:
+	* embed/mozilla/ExternalProtocolService.cpp:
+	* embed/mozilla/FilePicker.cpp:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+	* embed/mozilla/mozilla-embed-single.cpp:
+	* embed/mozilla/mozilla-notifiers.cpp:
+	* lib/ephy-file-helpers.c:
+	* lib/widgets/ephy-search-entry.c:
+
+	Change some more i18n inclusion and remove several
+	unused includes.
+
+2003-11-06  Marco Pesenti Gritti  <marco@gnome.org>
+
 	* data/epiphany.schemas.in:
 
 	Correct download dir default.
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index b59b9c6a4..ff5d03633 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -34,10 +34,6 @@
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <gtk/gtkprogressbar.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
 #define CONF_DOWNLOADING_SHOW_DETAILS "/apps/epiphany/dialogs/downloader_show_details"
 
diff --git a/embed/ephy-embed-popup-control.c b/embed/ephy-embed-popup-control.c
index 131de477a..0fc39c767 100644
--- a/embed/ephy-embed-popup-control.c
+++ b/embed/ephy-embed-popup-control.c
@@ -31,7 +31,6 @@
 #include <bonobo/bonobo-ui-component.h>
 #include <glib/gi18n.h>
 #include <gtk/gtkclipboard.h>
-#include <libgnome/gnome-exec.h>
 
 typedef enum
 {
diff --git a/embed/mozilla/ExternalProtocolService.cpp b/embed/mozilla/ExternalProtocolService.cpp
index 244a2d67b..89537cf8f 100644
--- a/embed/mozilla/ExternalProtocolService.cpp
+++ b/embed/mozilla/ExternalProtocolService.cpp
@@ -20,9 +20,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-i18n.h>
+#include <gtk/gtkmessagedialog.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include <nsString.h>
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index f37e31996..ab2044257 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -58,7 +58,6 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkmessagedialog.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 
 NS_IMPL_ISUPPORTS1(GFilePicker, nsIFilePicker)
 
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index df967874b..05026f7af 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -72,7 +72,7 @@
 #include <gtk/gtktextview.h>
 #include <gtk/gtkprogressbar.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "GtkNSSDialogs.h"
 #include "ephy-glade.h"
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index 2f2ee6efd..8f81c68ea 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -56,7 +56,7 @@
 #include "gtk/gtkhbox.h"
 #include "gtk/gtkvbox.h"
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "GtkNSSKeyPairDialogs.h"
 
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 1dd020a59..595e291b1 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -34,7 +34,7 @@
 #include "MozRegisterComponents.h"
 
 #include <time.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <nsICacheService.h>
 #include <nsCOMPtr.h>
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 9ff7766bf..d2656e71c 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -33,12 +33,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <gdk/gdkx.h>
 #include <nsCOMPtr.h>
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>
+#include <libgnome/gnome-i18n.h>
 
 #define MOZILLA_PREF_NO_PROXIES "network.proxy.no_proxies_on"
 #define MIGRATE_PIXEL_SIZE
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index e569805b7..0d61f5bfc 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-init.h>
-#include <libgnome/gnome-exec.h>
 
 #include "ephy-file-helpers.h"
 
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index 1e8a9e096..e6fa93a92 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -18,9 +18,10 @@
  *  $Id$
  */
 
-#include <gtk/gtklabel.h>
 #include <config.h>
-#include <libgnome/gnome-i18n.h>
+
+#include <gtk/gtklabel.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include "ephy-search-entry.h"