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

34 files changed, 99 insertions, 21 deletions

diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index e9d323a741..5df769d8e2 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/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>.
+
 2005-05-11  Not Zed  <NotZed@Ximian.com>
 
 	* Makefile.am: setup built_sources & cleanfiles.
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 7344806e83..31b69d9915 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -2,7 +2,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "shell/es-menu.h"
 
 void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target);
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 9048ee2928..dab7bbd35a 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <sys/wait.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 
 #define EVOLUTION "evolution-" BASE_VERSION
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 1302df7882..2877876382 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/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>.
+
 2006-08-17  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gaimbuddies.c: (bbdb_sync_buddy_list_check): Don't leak
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 06b0289455..0145f63a78 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -36,7 +36,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include <libebook/e-book.h>
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index e98dadaeb1..7661c6e6cf 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -40,7 +40,7 @@
 #include <e-util/e-xml-utils.h>
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 #include <libebook/e-book.h>
diff --git a/plugins/calendar-file/ChangeLog b/plugins/calendar-file/ChangeLog
index f99c80cd47..a98c581934 100644
--- a/plugins/calendar-file/ChangeLog
+++ b/plugins/calendar-file/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>.
+
 2006-02-28  Christian Kellner  <gicmo@gnome.org>
 
 	* calendar-file.c: fixing a leak.
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 46aad63788..a673f598e5 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -31,7 +31,7 @@
 #include <calendar/gui/e-cal-config.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-url.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
index d83bf9026c..16968f8182 100644
--- a/plugins/calendar-http/ChangeLog
+++ b/plugins/calendar-http/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>.
+
 2006-01-16  Tony Tsui  <tsui.tony@gmail.com>
 
 	Fixes #267402
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index 412a9c0107..755f13db2d 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -33,7 +33,7 @@
 #include <calendar/gui/e-cal-config.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-url.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data);
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index eba572420f..8f8bf6f8bd 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/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>.
+
 2005-07-13  Tor Lillqvist  <tml@novell.com>
 
 	* calendar-weather.c (e_calendar_weather_migrate): Don't return a
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 8fe917ba7f..4f5f4a1040 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -27,7 +27,7 @@
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-url.h>
 #include <libedataserver/e-categories.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <string.h>
diff --git a/plugins/default-source/ChangeLog b/plugins/default-source/ChangeLog
index d189345125..f8125968ff 100644
--- a/plugins/default-source/ChangeLog
+++ b/plugins/default-source/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>.
+
 2006-10-21  Priit Laes  <amd@store20.com>
 
 	* org-gnome-default-source.eplug.xml: Fix typo. Fixes #363999.
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index a7392f25f9..7cf0a47965 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -27,7 +27,7 @@
 #include <libebook/e-book.h>
 #include <libecal/e-cal.h>
 #include <libedataserver/e-source.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data);
 void commit_default_calendar (EPlugin *epl, EConfigTarget *target);
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 4e470410e1..4ebbabbb4d 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/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-01-27  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* exchange-account-setup.c:
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 9215c42e8c..0c9d405875 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -28,7 +28,7 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 
 #include "e-util/e-util-private.h"
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index c00b8bea1a..0c80f4b065 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/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-02-05  Sankar P  <psankar@novell.com>
 
         * junk-settings.c:
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index 1cd1691afb..1db534a24d 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -29,7 +29,7 @@
 #include <e-util/e-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
 #include <libedataserver/e-source.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 3455f6e5d2..3f5dbb5ddd 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -28,7 +28,7 @@
 #include <gnome.h>
 #include <gtk/gtk.h>
 #include <libgnomeui/libgnomeui.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-config.h>
 #include <mail/em-config.h>
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 86589d9df8..b5c63ba135 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -37,7 +37,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnome/gnome-init.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <e-util/e-error.h>
 #include <e-util/e-util-private.h>
 #include <e-gw-connection.h>
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 91f0384ee7..70a7099288 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <calendar/gui/e-cal-popup.h>
 #include <calendar/gui/e-calendar-view.h>
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index c98c0f940a..0e46c91219 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
 #include "mail/em-account-editor.h"
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index e4e32304e7..584dc7ae15 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <e-util/e-config.h>
 #include <mail/em-config.h>
 #include <mail/em-popup.h>
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog
index a6f2ee81f0..fecf14f5ee 100644
--- a/plugins/import-ics-attachments/ChangeLog
+++ b/plugins/import-ics-attachments/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>.
+
 2006-11-28  Parthasarathi Susarla <ajaysusarla@gmail.com>
 	
 	** Fix bug #348679
diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c
index 1ffaa563de..4300c1216c 100644
--- a/plugins/import-ics-attachments/icsimporter.c
+++ b/plugins/import-ics-attachments/icsimporter.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <e-util/e-config.h>
 #include <e-util/e-popup.h>
 #include <mail/em-popup.h>
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 0587816aee..99928d30b5 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/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-02-09  Sankar P  <psankar@novell.com>
 
 	* itip-formatter.c: (update_item), (view_response_cb):
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 27896c1a54..b91e19bcb8 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <camel/camel-stream.h>
 #include <camel/camel-stream-mem.h>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 6920347485..0a20ea43d3 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <camel/camel-stream.h>
 #include <camel/camel-stream-mem.h>
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
index db87c66748..ec90d2604e 100644
--- a/plugins/mark-all-read/ChangeLog
+++ b/plugins/mark-all-read/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>.
+
 2006-07-04  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* org-gnome-mark-all-read.eplug.xml: Using proper header
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index fc4c558b0e..872a3565e4 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <e-util/e-config.h>
 #include <mail/em-popup.h>
 #include <mail/mail-ops.h>
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index 7d2c4b360b..b2e5b7be55 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/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-02-20  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #238093 (bnc)
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 4184d1b369..6bba0876c0 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libedataserverui/e-passwords.h>
 #include <calendar/gui/e-cal-popup.h>
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
index 8b2cd985b9..9f2b8f741a 100644
--- a/plugins/subject-thread/ChangeLog
+++ b/plugins/subject-thread/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>.
+
 2005-05-12  Not Zed  <NotZed@Ximian.com>
 
 	* Makefile.am: setup built_sources/cleanfiles
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 870ba02f5b..a412b08ec5 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-config.h>
 #include <mail/em-config.h>