** Fixes bug #419524

2007-03-20  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #419524

	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.

	* e-util/e-xml-utils.c (e_xml_get_child_by_name_by_lang_list):
	* mail/em-migrate.c (emm_setup_initial):
	* shell/e-component-registry.c (query_components):
	* shell/e-shell-settings-dialog.c (load_pages):
	* shell/e-shell-window-commands.c (command_quick_reference):
	* tools/killev.c (main):
	Use g_get_language_names() instead of gnome_i18n_get_language_list().

	* e-util/e-util.c: Remove e_gettext().

	* e-util/Makefile.am: Remove e-i18n.h.


svn path=/trunk/; revision=33319

25 files changed, 30 insertions, 24 deletions

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 22199488a9..b63c41fac9 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 8274df5556..1e4f70eb19 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -29,7 +29,7 @@
 #include <gtk/gtksignal.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
 
 #include <misc/e-popup-menu.h>
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index d39cdf6051..dbb0e7dee2 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -33,7 +33,7 @@
 #include <gconf/gconf-client.h>
 #include <gdk/gdkkeysyms.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/libgnome.h>
 
 #include "e-attachment.h"
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index b865ce173a..705b5bb2c8 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -51,7 +51,7 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkdialog.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include "e-util/e-mktemp.h"
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 0dca636875..b46e80ddbb 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -43,7 +43,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtksignal.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
 
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 035dac8a36..7933998445 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -43,7 +43,7 @@
 #include <gtk/gtkpixmap.h>
 #include <gtk/gtksignal.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #define E_CALENDAR_SMALL_FONT_PTSIZE 6
 
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 58bda2436d..02f8f1675c 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -30,7 +30,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 8ec99ca0af..20562bc039 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -28,7 +28,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-canvas.h"
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 8eed38e7f1..f8a4f134a2 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -44,7 +44,7 @@
 #include <table/e-cell-text.h>
 
 #include <libgnomeui/gnome-messagebox.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <libedataserver/e-time-utils.h>
 
diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c
index 161e476345..76b4ffc06f 100644
--- a/widgets/misc/e-cell-percent.c
+++ b/widgets/misc/e-cell-percent.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <libgnomeui/gnome-messagebox.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-cell-percent.h"
 
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index f0080d22d5..faaec7225a 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -37,7 +37,7 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtksignal.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <bonobo/bonobo-ui-node.h>
 #include <bonobo/bonobo-ui-util.h>
diff --git a/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c
index b02561c0b7..98e3ecf62e 100644
--- a/widgets/misc/e-clipped-label.c
+++ b/widgets/misc/e-clipped-label.c
@@ -40,7 +40,7 @@
 
 #include <glib.h>
 #include <gdk/gdki18n.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 
 static void e_clipped_label_class_init (EClippedLabelClass *class);
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 5680fc44a9..6061b09f6d 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -58,7 +58,7 @@
 #include <gtk/gtkmessagedialog.h>
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 49abd260e2..1e15a8b539 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -32,7 +32,7 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-dropdown-button.h"
 #include "e-filter-bar.h"
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index cc89ce48d3..7fdb2cb415 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -30,7 +30,7 @@
 #include <gtk/gtkdnd.h>
 
 #include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-image-chooser.h"
 #include "e-util/e-util-marshal.h"
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 8acbdf5fe6..74359a26ac 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -27,7 +27,7 @@
 #include <gtk/gtksignal.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libart_lgpl/art_filterlevel.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c
index 1530e972ae..5c0ec29579 100644
--- a/widgets/misc/e-pilot-settings.c
+++ b/widgets/misc/e-pilot-settings.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include "e-pilot-settings.h"
 
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 0615effe6d..594ea1f87b 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 
 #include "text/e-text.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 #include "misc/e-unicode.h"
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 889f068eeb..6b20492e43 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -42,7 +42,7 @@
 #include <misc/e-unicode.h>
 #include <misc/e-gui-utils.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <bonobo/bonobo-ui-util.h>
 
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 834f473722..3f91ba42cc 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-selection-model-array.h"
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 09430de9f5..21eba118f2 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -25,7 +25,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 644d054905..f0c6fe42a1 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -28,7 +28,7 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <time.h>
 
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index 46e69342e6..2f591ab49f 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -32,7 +32,7 @@
 #include <gtk/gtkimage.h>
 #include <gtk/gtktooltips.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 
 #define SPACING 2
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 7ffe7e44f9..6bf1fdaaec 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -42,7 +42,7 @@
 
 #include <libedataserver/e-iconv.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-unicode.h"
 
 #define d(x) x
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 492cb65c3c..25aeda0f2c 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -24,7 +24,7 @@
 
 #include <gnome.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "color-palette.h"
 #include "e-colors.h"