** 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, 36 insertions, 30 deletions

diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index f0c226a1dc..ee35f6e2e7 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/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/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 013574475c..629a3588ed 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -59,7 +59,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-unicode.h"
 
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index 138868db12..d2319ee61e 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-unicode.h"
 
diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c
index ce7f5e0630..2ab6111a33 100644
--- a/widgets/table/e-cell-float.c
+++ b/widgets/table/e-cell-float.c
@@ -29,7 +29,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-cell-float.h"
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index b2ab40590d..e32eca7fe3 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-cell-number.h"
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 1d9967d23b..22d92bf98a 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -27,7 +27,7 @@
 
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include "e-cell-pixbuf.h"
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index ca28e1fbca..25a00085f8 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -50,7 +50,7 @@
 #include "a11y/e-table/gal-a11y-e-cell-registry.h"
 #include "a11y/e-table/gal-a11y-e-cell-text.h"
 #include "text/e-text.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-text-event-processor.h"
 #include "e-util/e-text-event-processor-emacs-like.h"
 #include "e-util/e-util.h"
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index a338df9cc5..b58d027978 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -32,7 +32,7 @@
 
 #include "a11y/e-table/gal-a11y-e-table-click-to-add.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-canvas-utils.h"
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 4983f70f15..b61d5b44cf 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-table-col.h"
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index af83f40c6a..d49cf08b53 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-table-config-field.h"
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index d7553e8804..f32f09cd21 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -36,7 +36,7 @@
 #include <libgnomeui/gnome-propertybox.h>
 #include <glade/glade.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
 #include "misc/e-unicode.h"
@@ -539,7 +539,7 @@ create_global_store (ETableConfig *config)
 	}
 }
 
-char *spec = "<ETableSpecification gettext-domain=\"" E_I18N_DOMAIN "\" no-headers=\"true\" cursor-mode=\"line\" " 	 
+char *spec = "<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\" no-headers=\"true\" cursor-mode=\"line\" " 	 
 " draw-grid=\"false\" draw-focus=\"true\" selection-mode=\"browse\">" 	 
 "<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" 	 
 "<ETableState> <column source=\"0\"/>" 	 
@@ -1093,14 +1093,14 @@ setup_gui (ETableConfig *config)
 			g_build_filename (EVOLUTION_GLADEDIR,
 					  "e-table-config.glade",
 					  NULL);
-		gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
+		gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
 		g_free (filename);
 	} else {
 		gchar *filename =
 			g_build_filename (EVOLUTION_GLADEDIR,
 					  "e-table-config-no-group.glade",
 					  NULL);
-		gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
+		gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
 		g_free (filename);
 	}
 
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 9845dd7fbc..db02b7eb83 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.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-table-field-chooser-dialog.h"
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 6742483fd6..3a94645550 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -32,7 +32,7 @@
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 786e0420b7..294d90e212 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 
@@ -156,7 +156,7 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
 	gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
 					    "e-table-field-chooser.glade",
 					    NULL);
-	gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN);
+	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
 	g_free (filename);
 	etfc->gui = gui;
 
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index b67b76e217..3a21171d1c 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -29,7 +29,7 @@
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
 #include "text/e-text.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas-utils.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 315ae0302a..9acf976021 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index a11338d6c7..15890b17b7 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -35,7 +35,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #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"
 #include "e-util/e-xml-utils.h"
@@ -1531,7 +1531,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 						 ((ethi->table || ethi->tree) ? 0 : 4) + 
 						 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
 						 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
-						 128, info, E_I18N_DOMAIN);
+						 128, info, GETTEXT_PACKAGE);
 	
 	menu_item = gtk_menu_item_new_with_label (_("Sort By"));
 	gtk_widget_show (menu_item);
@@ -1813,7 +1813,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 								 ((ethi->table || ethi->tree) ? 0 : 4) + 
 								 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
 								 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
-								 128, info, E_I18N_DOMAIN);
+								 128, info, GETTEXT_PACKAGE);
 			g_object_ref (popup);
 			gtk_object_sink (GTK_OBJECT (popup));
 			g_signal_connect (popup, "selection-done",
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 0936c03f31..221abb2044 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -38,7 +38,7 @@
 
 #include "a11y/e-table/gal-a11y-e-table-item-factory.h"
 #include "a11y/e-table/gal-a11y-e-table-item.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/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
index fc31f0eef6..3d581cd8c2 100644
--- a/widgets/table/e-table-scrolled.c
+++ b/widgets/table/e-table-scrolled.c
@@ -32,7 +32,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "e-table.h"
 #include "e-table-scrolled.h"
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index bdce7741c3..a16285c392 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -27,7 +27,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-table-selection-model.h"
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 0e74b6b2cf..3874f29bb1 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-table-sorter.h"
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 2a3f37570f..b42d860779 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -36,7 +36,7 @@
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
 #include "a11y/e-table/gal-a11y-e-table.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-background.h"
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
index 953009ea1e..1f1145065f 100644
--- a/widgets/table/e-tree-scrolled.c
+++ b/widgets/table/e-tree-scrolled.c
@@ -32,7 +32,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-tree-scrolled.h"
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 1a9cac548a..6e69615aeb 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -25,7 +25,7 @@
 #include <config.h>
 
 #include "table/e-tree-table-adapter.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 
 #include "e-tree-selection-model.h"
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index c3be4f0c24..f6679e59b3 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -32,7 +32,7 @@
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
 #include "a11y/e-table/gal-a11y-e-tree.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-marshal.h"
 #include "misc/e-canvas.h"