** 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

19 files changed, 24 insertions, 19 deletions

diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 44f8dab51c..255a874e3e 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/i18n.h> instead of <libgnome/gnome-i18n.h>.
+
 2007-03-01  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* e-table/gal-a11y-e-cell-tree.c: (kill_view_cb),
diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
index 1d26767a79..21449f3d8f 100644
--- a/a11y/addressbook/ea-addressbook-view.c
+++ b/a11y/addressbook/ea-addressbook-view.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "ea-addressbook-view.h"
 
 static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible);
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index 6ed202b867..0ecef175b4 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -20,11 +20,10 @@
  */
 
 #include <config.h>
-#include <libgnome/gnome-i18n.h>
 #include <string.h>
 #include <gtk/gtkaccessible.h>
 #include <glib/gstrfuncs.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "ea-minicard.h"
 #include "ea-minicard-view.h"
 #include "eab-gui-util.h"
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c
index 2bde576ab3..0bd1bd269c 100644
--- a/a11y/addressbook/ea-minicard.c
+++ b/a11y/addressbook/ea-minicard.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "ea-minicard.h"
 #include "ea-minicard-view.h"
 #include "e-minicard.h"
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 187531ce7c..9603c28dc3 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -26,7 +26,7 @@
 #include "ea-day-view.h"
 #include "ea-week-view.h"
 #include <text/e-text.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 static void ea_cal_view_event_class_init (EaCalViewEventClass *klass);
 static void ea_cal_view_event_init (EaCalViewEvent *a11y);
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
index 6a25455410..e357fc1a90 100644
--- a/a11y/calendar/ea-cal-view.c
+++ b/a11y/calendar/ea-cal-view.c
@@ -30,7 +30,7 @@
 #include "calendar-commands.h"
 #include "goto.h"
 #include <glib/gstrfuncs.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 static void ea_cal_view_class_init (EaCalViewClass *klass);
 
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
index 4912e6ee7a..f3f43c9a6f 100644
--- a/a11y/calendar/ea-day-view-main-item.c
+++ b/a11y/calendar/ea-day-view-main-item.c
@@ -28,7 +28,7 @@
 #include "ea-day-view.h"
 #include "ea-day-view-cell.h"
 #include "ea-cell-table.h"
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 /* EaDayViewMainItem */
 static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index d10deb49bd..a1e842de9b 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -30,7 +30,7 @@
 #include "ea-gnome-calendar.h"
 #include "calendar-commands.h"
 #include <glib/gstrfuncs.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 static void ea_day_view_class_init (EaDayViewClass *klass);
 
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
index 87bc568310..60ebde386d 100644
--- a/a11y/calendar/ea-gnome-calendar.c
+++ b/a11y/calendar/ea-gnome-calendar.c
@@ -29,7 +29,7 @@
 #include <gtk/gtknotebook.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-data-server-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
 
diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c
index d9bab31943..7dbaaa9851 100644
--- a/a11y/calendar/ea-jump-button.c
+++ b/a11y/calendar/ea-jump-button.c
@@ -28,7 +28,7 @@
 #include "ea-week-view.h"
 #include "e-week-view.h"
 #include <libgnomecanvas/gnome-canvas.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 static void ea_jump_button_class_init (EaJumpButtonClass *klass);
 
diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c
index 490c235446..deb4f6d3d4 100644
--- a/a11y/calendar/ea-week-view-main-item.c
+++ b/a11y/calendar/ea-week-view-main-item.c
@@ -28,7 +28,7 @@
 #include "ea-week-view.h"
 #include "ea-week-view-cell.h"
 #include "ea-cell-table.h"
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 /* EaWeekViewMainItem */
 static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass);
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
index a524c5bd6a..52ecafcbcf 100644
--- a/a11y/calendar/ea-week-view.c
+++ b/a11y/calendar/ea-week-view.c
@@ -29,7 +29,7 @@
 #include "ea-gnome-calendar.h"
 #include "calendar-commands.h"
 #include <text/e-text.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 static void ea_week_view_class_init (EaWeekViewClass *klass);
 
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index 8d5e40d70e..9b36f0903b 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -30,7 +30,7 @@
 
 #include "a11y/gal-a11y-util.h"
 #include "table/e-cell-popup.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "gal-a11y-e-cell-popup.h"
 #include "gal-a11y-e-cell-registry.h"
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index e1a485cd55..d751af1452 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -14,7 +14,7 @@
 
 #include "a11y/gal-a11y-util.h"
 #include "table/e-cell-text.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "gal-a11y-e-cell-text.h"
 
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index 7706062908..6d1bbfd45e 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -2,7 +2,7 @@
 
 #include "table/e-cell-toggle.h"
 #include "table/e-table-model.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "gal-a11y-e-cell-toggle.h"
 
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index b86ecc01bd..06b88652c1 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -14,7 +14,7 @@
 #include "table/e-cell-tree.h"
 #include "table/e-table.h"
 #include "table/e-tree-table-adapter.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "gal-a11y-e-cell-tree.h"
 #include "gal-a11y-e-cell-registry.h"
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index d6b69a47f3..c19622d2b5 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -15,7 +15,7 @@
 #include "a11y/gal-a11y-util.h"
 #include "table/e-table.h"
 #include "table/e-tree.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "gal-a11y-e-cell.h"
 #include "gal-a11y-e-cell-vbox.h"
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index 9d96f3cf18..819946cbbb 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -13,7 +13,7 @@
 #include "table/e-table-click-to-add.h"
 #include "table/e-table-group.h"
 #include "table/e-table-group-leaf.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "gal-a11y-e-table-click-to-add.h"
 #include "gal-a11y-e-table-click-to-add-factory.h"
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
index 0aeac944df..2529cb87b8 100644
--- a/a11y/widgets/ea-calendar-item.c
+++ b/a11y/widgets/ea-calendar-item.c
@@ -29,7 +29,7 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <glib/gdate.h>
 #include <e-util/e-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include "ea-calendar-item.h"
 #include "ea-calendar-cell.h"