From c4adc027e42c40f9698cdbdf3eeede3c6de06c49 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 10 Jun 2008 21:24:10 +0000
Subject: Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.

2008-06-10  Matthew Barnes  <mbarnes@redhat.com>

	* addressbook/gui/component/addressbook-component.c:
	* calendar/common/authentication.c:
	* calendar/gui/calendar-component.c:
	* calendar/gui/comp-editor-factory.c:
	* calendar/gui/dialogs/copy-source-dialog.c:
	* calendar/gui/dialogs/select-source-dialog.c:
	* calendar/gui/memos-component.c:
	* calendar/gui/migration.c:
	* calendar/gui/tasks-component.c:
	* shell/test/evolution-test-component.c:
	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.


svn path=/trunk/; revision=35625
---
 addressbook/ChangeLog                             |  5 +++++
 addressbook/gui/component/addressbook-component.c |  2 +-
 calendar/ChangeLog                                | 12 ++++++++++++
 calendar/common/authentication.c                  |  2 +-
 calendar/gui/calendar-component.c                 |  2 +-
 calendar/gui/comp-editor-factory.c                |  2 +-
 calendar/gui/dialogs/copy-source-dialog.c         |  2 +-
 calendar/gui/dialogs/select-source-dialog.c       |  2 +-
 calendar/gui/memos-component.c                    |  2 +-
 calendar/gui/migration.c                          |  2 +-
 calendar/gui/tasks-component.c                    |  2 +-
 shell/ChangeLog                                   |  5 +++++
 shell/test/evolution-test-component.c             |  2 +-
 13 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 12892e782b..8cfc553df9 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/component/addressbook-component.c:
+	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.
+
 2008-06-03  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* gui/merging/eab-contact-merging.c: (mergeit):
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 952a657447..7d4b5d37b5 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -45,7 +45,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-util.h>
 #include <libedataserver/e-url.h>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f4e2ded865..ead93c4a82 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* common/authentication.c:
+	* gui/calendar-component.c:
+	* gui/comp-editor-factory.c:
+	* gui/dialogs/copy-source-dialog.c:
+	* gui/dialogs/select-source-dialog.c:
+	* gui/memos-component.c:
+	* gui/migration.c:
+	* gui/tasks-component.c:
+	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.
+
 2008-06-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #536813
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index b21cded8e4..5d01793cd3 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-passwords.h>
 #include "authentication.h"
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 9dffb61b43..eaa30d5a03 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -27,8 +27,8 @@
 
 #include <string.h>
 #include <errno.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <libical/icalvcal.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index a258206149..4d0685abfd 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -23,8 +23,8 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
 #include <evolution-calendar.h>
 #include <libedataserver/e-url.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 12996cd48a..d664e476b9 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include "copy-source-dialog.h"
 #include "select-source-dialog.h"
 #include "common/authentication.h"
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 06e8bfc0d7..d490bfc6e3 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
 #include <e-util/e-icon-factory.h>
 #include <libedataserverui/e-source-selector-dialog.h>
 #include "select-source-dialog.h"
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index aed668e825..705dc179ec 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -27,8 +27,8 @@
 
 #include <errno.h>
 #include <string.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal.h>
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index fc4c7b6c77..bcc2488c31 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -30,9 +30,9 @@
 #include <errno.h>
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <bonobo/bonobo-i18n.h>
 #include <libecal/e-cal.h>
 
 #include <libebackend/e-dbhash.h>
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 38085cb77e..6abedd334a 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -26,8 +26,8 @@
 
 #include <errno.h>
 #include <string.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal.h>
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e3844c5e28..7a7b6831a4 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* test/evolution-test-component.c:
+	Use <glib/gi18n.h> instead of <bonobo/bonobo-i18n.h>.
+
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #534360
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index b53608d4af..4494d4808c 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -26,9 +26,9 @@
 
 #include <errno.h>
 #include <string.h>
+#include <glib/gi18n.h>
 #include <bonobo/bonobo-shlib-factory.h>
 #include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <gtk/gtklabel.h>
 #include "e-task-bar.h"
-- 
cgit v1.2.3