From cba3097cad7443810117bded371a2e3088a33d12 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 20 Mar 2007 17:23:58 +0000
Subject: ** 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
---
 composer/ChangeLog                       | 6 ++++++
 composer/e-msg-composer-attachment-bar.c | 2 +-
 composer/e-msg-composer-attachment.c     | 2 +-
 composer/e-msg-composer-hdrs.c           | 2 +-
 composer/e-msg-composer-select-file.c    | 2 +-
 composer/e-msg-composer.c                | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'composer')

diff --git a/composer/ChangeLog b/composer/ChangeLog
index eb8fc74ef4..6475dd7a8a 100644
--- a/composer/ChangeLog
+++ b/composer/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/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index f44745dd06..83a4545608 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -32,7 +32,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 "e-msg-composer.h"
 #include "e-msg-composer-select-file.h"
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index a8b6b0e726..295c9a26ad 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -39,7 +39,7 @@
 
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <camel/camel.h>
 
 #include "e-util/e-mktemp.h"
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 7be2e385a4..e4d4b046fd 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -35,7 +35,7 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtktooltips.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-name-selector.h>
 #include <libedataserverui/e-name-selector-entry.h>
 #include <libedataserverui/e-name-selector-list.h>
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index c9e98c0a8e..e35369bd72 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -41,7 +41,7 @@
 #endif
 
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "e-msg-composer-select-file.h"
 #include <e-util/e-icon-factory.h>
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 44233ff406..17a2af7b9e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -63,7 +63,7 @@
 
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-help.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-window-icon.h>
 
-- 
cgit