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

13 files changed, 44 insertions, 32 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index dc1935ddda..b0682dc140 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,16 @@
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
+	** Fixes part of bug #419524
+
+	* Include <glib/gi18n.h> instead of <libgnome/gnome-i18n.h>.
+
+	* e-component-registry.c (query_components):
+	* e-shell-settings-dialog.c (load_pages):
+	* e-shell-window-commands.c (command_quick_reference):
+	Use g_get_language_names() instead of gnome_i18n_get_language_list().
+
+2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
+
 	** Fixes bug #419469 - Miscellaneous main.c cleanups
 
 	* main.c (kill_dataserver): Kill evolution-data-server-1.8.
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 12ccd82c5a..d4a9411490 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -28,7 +28,7 @@
 
 #include <e-util/e-icon-factory.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
@@ -146,8 +146,9 @@ static void
 query_components (EComponentRegistry *registry)
 {
 	Bonobo_ServerInfoList *info_list;
+	const gchar * const *language_names;
 	CORBA_Environment ev;
-	GSList *language_list;
+	GSList *languages = NULL;
 	const GList *l;
 	char *query;
 	int i;
@@ -170,9 +171,9 @@ query_components (EComponentRegistry *registry)
 		return;
 	}
 
-	l = gnome_i18n_get_language_list("LC_MESSAGES");
-	for (language_list=NULL;l;l=l->next)
-		language_list = g_slist_append(language_list, l->data);
+	language_names = g_get_language_names ();
+	while (*language_names != NULL)
+		languages = g_slist_append (languages, *language_names++);
 
 	for (i = 0; i < info_list->_length; i++) {
 		const char *id;
@@ -200,13 +201,13 @@ query_components (EComponentRegistry *registry)
 			continue;
 		}
 
-		label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list);
+		label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages);
 		
-		tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list);
+		tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages);
 
-		menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list);
+		menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages);
 
-		menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list);
+		menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", languages);
 
 		alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL);
 
@@ -235,7 +236,7 @@ query_components (EComponentRegistry *registry)
 			g_object_unref (menuicon);
 		bonobo_object_release_unref(iface, NULL);
 	}
-	g_slist_free(language_list);
+	g_slist_free(languages);
 
 	CORBA_free (info_list);
 	CORBA_exception_free (&ev);
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index db0e9d4d41..b681311b78 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -31,7 +31,7 @@
 #include <gtk/gtkrc.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "misc/e-clipped-label.h"
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 8b9bb72b13..29946319be 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -33,7 +33,7 @@
 
 #include <glade/glade.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-edge.h>
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 8d72da9291..67dc214b41 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -148,9 +148,9 @@ load_pages (EShellSettingsDialog *dialog)
 {
 	EShellSettingsDialogPrivate *priv;
 	Bonobo_ServerInfoList *control_list;
+	const gchar * const *language_names;
 	CORBA_Environment ev;
-	const GList *l;
-	GSList *language_list;
+	GSList *languages = NULL;
 	GList *page_list;
 	GList *p;
 	int i, j;
@@ -168,10 +168,9 @@ load_pages (EShellSettingsDialog *dialog)
 
 	CORBA_exception_free (&ev);
 
-	/* Great, one uses GList the other GSList (!) */
-	l = gnome_i18n_get_language_list("LC_MESSAGES");
-	for (language_list=NULL;l;l=l->next)
-		language_list = g_slist_append(language_list, l->data);
+	language_names = g_get_language_names ();
+	while (*language_names != NULL)
+		languages = g_list_append (languages, *language_names++);
 
 	page_list = NULL;
 	for (i = 0; i < control_list->_length; i ++) {
@@ -189,8 +188,8 @@ load_pages (EShellSettingsDialog *dialog)
 
 		info = & control_list->_buffer[i];
 
-		title       	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", language_list);
-		description 	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", language_list);
+		title       	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages);
+		description 	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages);
 		icon_path   	= bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL);
 		type            = bonobo_server_info_prop_find   (info, "evolution2:config_item:type");
 		priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL);
@@ -232,7 +231,7 @@ load_pages (EShellSettingsDialog *dialog)
 
 		CORBA_exception_free (&ev);
 	}
-	g_slist_free(language_list);
+	g_slist_free(languages);
 
 	page_list = sort_page_list (page_list);
 	for (p = page_list, i = 0; p != NULL; p = p->next, i++) {
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index b5a8b9b25c..361b331333 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 
 #include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
 
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 75749c41a4..010e229775 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -28,7 +28,7 @@
 #include <glib/gprintf.h>
 
 #include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-url.h>
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -611,10 +611,11 @@ command_quick_reference (BonoboUIComponent *uih,
 {
 	char *quickref;
 	GnomeVFSMimeApplication *app;
-	const GList *lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");
+	const gchar * const *language_names;
 
-	for (; lang_list != NULL; lang_list = lang_list->next) {
-		const char *lang = lang_list->data;
+	language_names = g_get_language_names ();
+	while (*language_names != NULL) {
+		const gchar *lang = *language_names++;
 
 		/* This has to be a valid language AND a language with
 		 * no encoding postfix.  The language will come up without
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index f8ecc993e9..0ed77f19fe 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -51,7 +51,7 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-widget.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-gconf.h>
 
 #include <gconf/gconf-client.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 9da09fa43c..95eb91078a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -44,7 +44,7 @@
 #undef interface
 #endif
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 
 #include <gconf/gconf-client.h>
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index 4a29bd35c3..11e859d867 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -36,7 +36,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-control.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkimage.h>
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index eceb9e01d9..91c03d4786 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -28,7 +28,7 @@
 #include "e-util/e-dialog-utils.h"
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-moniker-util.h>
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index f2f7f6898d..e6130a26e7 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -49,7 +49,7 @@
 
 #include <libgnome/gnome-config.h>
 /*#include <libgnome/gnome-util.h>*/
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-widget.h>
diff --git a/shell/main.c b/shell/main.c
index 66dad4a5cb..b8ac07f92f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -55,7 +55,7 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-sound.h>
 #include <libgnomeui/gnome-ui-init.h>