Fixed many issues mentioned in #112781.

9 files changed, 19 insertions, 10 deletions

diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index 2d29bdf36..564085704 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -29,7 +29,7 @@
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
 #include <gtk/gtkwidget.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <gtk/gtkmessagedialog.h>
 
 static GConfClient *global_gconf_client = NULL;
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 1b66004f0..6ca68be28 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnome/gnome-init.h>
 #include <libgnome/gnome-exec.h>
 
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 431b1cea2..d41d2a554 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -16,12 +16,16 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-gui.h"
 #include "eel-gconf-extensions.h"
 
 #include <ctype.h>
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnome/gnome-help.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkmessagedialog.h>
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index befbbf66e..9af43551c 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/lib/ephy-start-here.c b/lib/ephy-start-here.c
index 834d890da..d35701030 100644
--- a/lib/ephy-start-here.c
+++ b/lib/ephy-start-here.c
@@ -16,9 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <string.h>
 
 #include "ephy-start-here.h"
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index cf0272f61..46a6b6d9f 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -16,12 +16,16 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ephy-string.h"
 
+#include <errno.h>
 #include <string.h>
 #include <glib.h>
-#include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
+#include <bonobo/bonobo-i18n.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libxml/parser.h>
 
diff --git a/lib/widgets/ephy-autocompletion-window.c b/lib/widgets/ephy-autocompletion-window.c
index d3c73b493..1af4a7481 100644
--- a/lib/widgets/ephy-autocompletion-window.c
+++ b/lib/widgets/ephy-autocompletion-window.c
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <libgnome/gnome-i18n.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkscrolledwindow.h>
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 5b94a5069..b1c4e003b 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -23,7 +23,6 @@
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkwindow.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
 
 #include "eggtreemodelfilter.h"
 #include "ephy-node-view.h"
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 6ea3544e9..ebeb17fd3 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include <gtk/gtktreeview.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-i18n.h>
 #include <time.h>
 #include <string.h>