From 607ce3802eabee692e55d89aacefd06390819e07 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <takao.fujiwara@sun.com>
Date: Fri, 9 Jan 2009 07:36:29 +0000
Subject: Reviewed by Matthew Barnes <mbarnes@redhat.com>

2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>

	Reviewed by Matthew Barnes  <mbarnes@redhat.com>

	* Fix for bug #566011

	* addressbook/gui/component/Makefile.am:
	* addressbook/gui/component/addressbook-component.c
	(addressbook_component_class_init):
	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
	add bindtextdomain().

	* calendar/gui/Makefile.am:
	* calendar/gui/calendar-component.c (calendar_component_class_init):
	* calendar/gui/dialogs/comp-editor.c:
	* calendar/gui/memos-component.c (memos_component_class_init):
	* calendar/gui/tasks-component.c (tasks_component_class_init):
	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
	add bindtextdomain().

	* composer/e-composer-header-table.c:
	* composer/e-composer-private.h:
	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.

	* mail/mail-component.c (mail_component_class_init):
	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
	add bindtextdomain().

	* shell/e-user-creatable-items-handler.c
	(e_user_creatable_items_handler_class_ini):
	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
	add bindtextdomain().

	* widgets/misc/e-charset-picker.c:
	* widgets/misc/e-signature-combo-box.c:
	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.


svn path=/trunk/; revision=37021
---
 addressbook/ChangeLog                             | 12 ++++++++++++
 addressbook/gui/component/Makefile.am             |  1 +
 addressbook/gui/component/addressbook-component.c |  5 ++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f2f213fb92..7f32350b14 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
+
+	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
+
+	* Fix for bug #566011
+
+	* gui/component/Makefile.am:
+	* gui/component/addressbook-component.c
+	(addressbook_component_class_init):
+	Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
+	add bindtextdomain().
+
 2009-01-08  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #339879
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 9eec272a0d..5ebdac4eb4 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES =							\
 	-I$(top_srcdir)/addressbook/gui/widgets			\
 	-I$(top_srcdir)/a11y/addressbook			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
 	-DPREFIX=\""$(prefix)"\"				\
 	$(LDAP_CFLAGS)						\
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index d61338314d..bd522b97d3 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -44,7 +44,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-util.h>
 #include <libedataserver/e-url.h>
@@ -462,6 +462,9 @@ addressbook_component_class_init (AddressbookComponentClass *class)
 	POA_GNOME_Evolution_Component__epv *epv = &class->epv;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
+	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
 	epv->createView              = impl_createView;
 	epv->_get_userCreatableItems = impl__get_userCreatableItems;
 	epv->requestCreateItem       = impl_requestCreateItem;
-- 
cgit