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

58 files changed, 63 insertions, 57 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index cfdf9bfb10..6e8897152e 100644
--- a/calendar/ChangeLog
+++ b/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-03-05  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* gui/dialogs/event-page.c: (event_page_fill_component): Set the
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 0c2ec42d7f..99c75066f4 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -33,7 +33,7 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #if 0 
 #  include <libgnomeui/gnome-winhints.h>
 #endif
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index d635eb6f74..cd25ada5d5 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -43,7 +43,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtktooltips.h>
 #include <gtk/gtkversion.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-sound.h>
 #include <libgnomeui/gnome-dialog-util.h>
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 141e49e6d5..4b7c563319 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-init.h>
 #include <libgnome/gnome-sound.h>
 #include <libgnomeui/gnome-client.h>
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 661b0f44c0..f1c694a02f 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "config-data.h"
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 6e5751d2cc..7b2efc5de2 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-categories.h>
 #include <e-util/e-icon-factory.h>
 #include <libedataserver/e-categories.h>
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 40abe4efaf..ef517f7137 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -47,7 +47,7 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-exception.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index 53d48e5478..080c7cb387 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "calendar-view-factory.h"
 #include "calendar-view.h"
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 15831d8ed9..97f6c02fc3 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -36,7 +36,7 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkoptionmenu.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <libedataserver/e-time-utils.h>
 #include "e-util/e-dialog-widgets.h"
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 3c101f860c..2743f8f9a8 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -45,7 +45,7 @@
 #endif
 
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include "cal-attachment-select-file.h"
 #include <e-util/e-icon-factory.h>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 9763ce3e57..38f9ed50a6 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -35,7 +35,7 @@
 #include <widgets/misc/e-dateedit.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-util-private.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <string.h>
 
 static const int week_start_day_map[] = {
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index ab091bcade..4e679054e6 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -30,7 +30,7 @@
 
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/libgnomeui.h>
 #include <libecal/e-cal.h>
 #include "calendar-setup.h"
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 1c19e734ae..de06b835ec 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <e-util/e-icon-factory.h>
 #include "e-util/e-error.h"
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index a76b123b36..14d27b2424 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <e-util/e-icon-factory.h>
 #include "changed-comp.h"
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 22461c5107..8c9d488f4f 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include "comp-editor-page.h"
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index b752e2ac48..038489353c 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -27,7 +27,7 @@
 #include <libical/ical.h>
 #include <glib.h>
 #include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 71678b3dc3..71e31e0515 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -34,7 +34,7 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-widget.h>
 #include <libgnome/libgnome.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomeui/gnome-uidefs.h>
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index c11cb29624..1624b8c30d 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -26,7 +26,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <e-util/e-icon-factory.h>
 #include "e-util/e-error.h"
 #include "../calendar-config.h"
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index 5932abeab8..cec4b448ac 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <e-util/e-icon-factory.h>
 #include "delete-error.h"
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 39a6cb2789..a8a1c365a2 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <misc/e-dateedit.h>
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index aa20384f93..c8be07a0a9 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -31,7 +31,7 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include "common/authentication.h"
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 081d6aac96..fb977c3a97 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -30,7 +30,7 @@
 
 #include <string.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <evolution-shell-component-utils.h>
 #include <e-util/e-util-private.h>
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 655738894c..15cf4ab83f 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -33,7 +33,7 @@
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include <libedataserverui/e-name-selector.h>
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 07cc441326..c28d29e554 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include "recur-comp.h"
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index e2696026b2..2ee4f1a410 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -39,7 +39,7 @@
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 8faabbee44..3aeb03b328 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -30,7 +30,7 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-dialog-util.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index a3fc8a2152..9484add139 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <misc/e-dateedit.h>
 #include <misc/e-url-entry.h>
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 482fb4ef39..35b92bc63b 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index de35a55982..c40a7e6f9f 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -33,7 +33,7 @@
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include <misc/e-dateedit.h>
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 4b05579abf..5f6a191d0d 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -25,7 +25,7 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreednd.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <glib.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-time-utils.h>
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index fa41d4cae2..02b414cbe7 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -50,7 +50,7 @@
 #include <table/e-cell-combo.h>
 #include <misc/e-popup-menu.h>
 #include <misc/e-cell-date-edit.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-util.h>
 #include <e-util/e-categories-config.h>
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index e7af82566e..9e02766a6d 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "e-cal-model-calendar.h"
 #include "e-cell-date-edit-text.h"
 #include "itip-utils.h"
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index ba5f8ab067..84bce4bcb0 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "e-cal-model-memos.h"
 #include "e-cell-date-edit-text.h"
 #include "misc.h"
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 863ab224f6..b481c52048 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <string.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include "calendar-config.h"
 #include "e-cal-model-tasks.h"
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 1963ee69c8..19bd29e8f7 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <glib/garray.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-time-util.h>
 #include "comp-util.h"
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 280db93e89..ab12a51ab2 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -39,7 +39,7 @@
 #include <camel/camel-mime-part.h>
 #include <camel/camel-stream-vfs.h>
 #include "e-util/e-util.h"
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 #include "e-util/e-mktemp.h"
 #include "e-util/e-dialog-utils.h"
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 6ab0e7f908..2ee44b29a6 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -37,7 +37,7 @@
 #include <gtk/gtkbox.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
 #include <e-util/e-error.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 4dc56fa7e8..a93c5e3ab3 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock-icons.h> 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 88dc12c44d..b15f243e2c 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -36,7 +36,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkradiomenuitem.h>
 #include <gtk/gtkcheckmenuitem.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <misc/e-gui-utils.h>
 #include "e-day-view-time-item.h"
 #include "calendar-config.h"
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index f628d0ad6a..ea487a1951 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "e-util/e-categories-config.h"
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 23fe92437e..4a31780d61 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -46,7 +46,7 @@
 #include <misc/e-gui-utils.h>
 #include <misc/e-unicode.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-util.h>
 #include <e-util/e-categories-config.h>
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 997d9b898f..24624aa0a0 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -32,7 +32,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtkmisc.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 2d06b4b1b4..ff794f1048 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -31,7 +31,7 @@
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-exception.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libebook/e-book.h>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index b651c96bdb..e9a083fe89 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libebook/e-book.h>
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index a2acca67bb..8f08164757 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -34,7 +34,7 @@
 
 #include <time.h>
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "calendar-config.h"
 #include "e-meeting-time-sel-item.h"
 #include "e-meeting-time-sel.h"
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index c8fed9e2e6..dde51f0ccc 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -51,7 +51,7 @@
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkvscrollbar.h>
 #include <libgnomeui/gnome-dateedit.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
 
 #include <misc/e-canvas.h>
diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c
index 27f723a63c..a4e1d245a8 100644
--- a/calendar/gui/e-pub-utils.c
+++ b/calendar/gui/e-pub-utils.c
@@ -28,7 +28,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libedataserverui/e-passwords.h>
 #include <libecal/e-cal-time-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "calendar-config.h"
 #include "common/authentication.h"
 #include "itip-utils.h"
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 04ee657f92..0699826999 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -35,7 +35,7 @@
 #include <gtk/gtksignal.h>
 #include <gnome.h>
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "e-timezone-entry.h"
 #include <e-util/e-icon-factory.h>
 
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 85bcc0224a..fa7cf38bf1 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "e-week-view-main-item.h"
 #include "ea-calendar.h"
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b9555a30b9..b9da861609 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -41,7 +41,7 @@
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index c400cc1ec2..6a00e4f37c 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -36,7 +36,7 @@
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkbindings.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 8cd149419b..b8c5324369 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -27,7 +27,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-moniker-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-time-utils.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkwidget.h>
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index bc74781ce1..f20e093045 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-init.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <glade/glade.h>
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 213e3affb2..3d4fc5182c 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -30,7 +30,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 067c4abeea..495ef343fd 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <libedataserver/e-url.h>
-#include "e-util/e-i18n.h"
+#include <glib/gi18n.h>
 
 #include "misc.h"
 
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e9629c0648..50ef236ac0 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -34,7 +34,7 @@
 #include <glib.h>
 #include <gtk/gtkradiobutton.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-stock-icons.h>
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 8633af8d4e..e81fd85d93 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -29,7 +29,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 28454dc983..a94f7d8b5a 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <gtk/gtksignal.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <libgnomecanvas/gnome-canvas-text.h>
 #include "weekday-picker.h"