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

36 files changed, 58 insertions, 54 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9260dcf6c4..b51720be54 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+	* em-migrate.c (emm_setup_initial): Use g_get_language_names()
+	instead of gnome_i18n_get_language_list().
+
 2007-03-16  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #360240
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 2537ee9225..ced74400dd 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -64,7 +64,7 @@
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtktable.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index f49ff4009a..7e31d637b3 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -33,7 +33,7 @@
 #include <gtk/gtkcellrenderertoggle.h>
 #include <gtk/gtkcellrenderertext.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "mail-component.h"
 #include "mail-config.h"
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 39824109bf..0334783f95 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -29,7 +29,7 @@
 
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "mail-mt.h"
 #include "mail-ops.h"
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 49837c775f..7d98a96583 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
 
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index e2f0b81b9f..3b82969b93 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "em-filter-folder-element.h"
 #include "mail/em-folder-selection-button.h"
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index f782f8827b..a5a9782f07 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "em-filter-rule.h"
 #include "em-filter-context.h"
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 3b7fe1244e..a278fa3b43 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -44,7 +44,7 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-vtrash-folder.h>
 #include <camel/camel-vee-folder.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "em-folder-properties.h"
 #include "em-config.h"
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 58712a9f76..575a637443 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -31,7 +31,7 @@
 #include <gtk/gtkhbox.h>
 
 #include <e-util/e-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "mail-component.h"
 #include "em-folder-tree.h"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 9aebc55385..42453837fb 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <e-util/e-util.h>
 #include <misc/e-gui-utils.h>
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index ec4069a6d0..2467b71a7c 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -39,7 +39,7 @@
 
 #include <e-util/e-mktemp.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-file-utils.h>
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 234510f6cf..c6eed2f54b 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -38,7 +38,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-session.h>
 #include <camel/camel-store.h>
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index ff5947bcdd..43f7b83ae4 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -37,7 +37,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-session.h>
 #include <camel/camel-store.h>
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 62bab84957..b40c70b158 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -33,7 +33,7 @@
 
 #include <e-util/e-icon-factory.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 
 /* class name -> klass map for EMFormat and subclasses */
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 0dafa172d0..fa5c05bda0 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -67,7 +67,7 @@
 #include <glade/glade.h>
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <bonobo/bonobo-control-frame.h>
 #include <bonobo/bonobo-stream-memory.h>
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 603ec21044..b9bb3b8673 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -51,7 +51,7 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-mime-message.h>
 #include <camel/camel-stream.h>
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 282fc113b4..87fccaba55 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -35,7 +35,7 @@
 #include <camel/camel-url.h>
 
 #include <libedataserver/e-iconv.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "em-stripsig-filter.h"
 #include "em-format-quote.h"
diff --git a/mail/em-format.c b/mail/em-format.c
index 54729c2303..32fc1d0b91 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -31,7 +31,7 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <libedataserver/e-msgport.h>
 #include <camel/camel-url.h>
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 723561ec21..85887fb5e4 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -54,7 +54,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <e-util/e-util.h>
 #include <libedataserver/e-data-server-util.h>
@@ -2645,38 +2645,33 @@ emm_setup_initial(const char *evolution_dir)
 {
 	GDir *dir;
 	const char *d;
-	struct stat st;
-	const GList *l;
 	char *local, *base;
+	const gchar * const *language_names;
 
 	/* special-case - this means brand new install of evolution */
 	/* FIXME: create default folders and stuff... */
 
 	d(printf("Setting up initial mail tree\n"));
 	
-	base = g_build_filename(evolution_dir, "mail/local", NULL);
+	base = g_build_filename(evolution_dir, "mail", "local", NULL);
 	if (e_util_mkdir_hier(base, 0777) == -1 && errno != EEXIST) {
 		g_free(base);
 		return -1;
 	}
 
 	/* e.g. try en-AU then en, etc */
-	for (l = gnome_i18n_get_language_list("LC_MESSAGES");
-	     l != NULL;
-	     l = g_list_next(l)) {
-		local = g_build_filename(EVOLUTION_PRIVDATADIR,
-					 "default",
-					 (char *)l->data,
-					 "mail/local", NULL);
-		if (g_stat(local, &st) == 0)
-			goto gotlocal;
-
-		g_free(local);
-	}
-
-	local = g_build_filename(EVOLUTION_PRIVDATADIR,
-				 "default/C/mail/local", NULL);
-gotlocal:
+	language_names = g_get_language_names ();
+	while (*language_names != NULL) {
+		local = g_build_filename (
+			EVOLUTION_PRIVDATADIR, "default",
+			*language_names++, "mail", "local", NULL);
+		if (g_file_test (local, G_FILE_TEST_EXISTS))
+			break;
+		g_free (local);
+	}
+
+	/* Make sure we found one. */
+	g_assert (*language_names != NULL);
 
 	dir = g_dir_open(local, 0, NULL);
 	if (dir) {
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 13d85df201..833da13696 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -41,7 +41,7 @@
 #include <libgnome/gnome-url.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "em-popup.h"
 #include "libedataserver/e-msgport.h"
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 45e1c47251..0f63800efa 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -44,7 +44,7 @@
 #include "mail-config.h"
 
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkscrolledwindow.h>
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 0c6945444a..6c34fb624d 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -59,7 +59,7 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "mail-component.h"
 #include "mail-mt.h"
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index e1b78381c2..ea0c7149bb 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
 
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 19510f389a..a796f2635d 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "camel/camel-url.h"
 #include "em-vfolder-context.h"
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c
index 04f14bfc01..e9f1f64f86 100644
--- a/mail/importers/evolution-outlook-importer.c
+++ b/mail/importers/evolution-outlook-importer.c
@@ -43,7 +43,7 @@
 #include <gtk/gtkprogressbar.h>
 
 #include <bonobo/bonobo-control.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-exception.h>
 #include <camel/camel-folder.h>
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 753c1eb754..df50c68dfb 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -38,7 +38,7 @@
 
 #include <gmodule.h>
 #include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-store.h>
 #include <camel/camel-mime-message.h>
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index e492fd4df9..4405b761ff 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -32,7 +32,7 @@
 #include <string.h>
 
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
 #include <libgnomeui/gnome-popup-menu.h>
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 585c5b20fc..efeb17dab3 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -78,7 +78,7 @@
 
 #include <table/e-tree.h>
 #include <table/e-tree-memory.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-file-utils.h>
 #include <camel/camel-vtrash-folder.h>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 598141657e..4b83b960b2 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -37,7 +37,7 @@
 #include <glib/gstdio.h>
 
 #include <libgnome/gnome-sound.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <camel/camel-store.h>
 #include <camel/camel-folder.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 3b77496d07..4be57aaea4 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <libedataserver/e-msgport.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 71e1bfedc9..8cff6f8661 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -36,7 +36,7 @@
 #include <glib/gstdio.h>
 
 #include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-mime-filter-from.h>
 #include <camel/camel-stream-filter.h>
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 2fc91f6f53..4ba64d6052 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -39,7 +39,7 @@
 #include <gtk/gtkbox.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <libgnomeui/gnome-window-icon.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-util/e-gtk-utils.h"
 #include "libedataserver/e-account-list.h"
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index cedf4a01c7..85b149df1b 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -37,7 +37,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-file-utils.h>
 #include <camel/camel-mime-message.h>
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 727ed89866..5b68e4e019 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-vee-folder.h>
 #include <camel/camel-vee-store.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 55a840ad80..2634abadeb 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -38,7 +38,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <camel/camel-exception.h>
 #include <camel/camel-file-utils.h>
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index b721134161..a9cec6eb25 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -52,7 +52,7 @@
 #include <gconf/gconf-client.h>
 
 #include <libgnomeui/gnome-pixmap.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"