From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 12 Jan 2009 04:12:01 +0000
Subject: Merge revisions 36866:37046 from trunk.

svn path=/branches/kill-bonobo/; revision=37050
---
 mail/mail-component.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'mail/mail-component.c')

diff --git a/mail/mail-component.c b/mail/mail-component.c
index 9013556388..c2ccb69729 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -80,7 +80,7 @@
 
 #include <table/e-tree.h>
 #include <table/e-tree-memory.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <camel/camel-file-utils.h>
 #include <camel/camel-vtrash-folder.h>
@@ -1239,6 +1239,9 @@ mail_component_class_init (MailComponentClass *class)
 	POA_GNOME_Evolution_MailComponent__epv *mepv = &class->epv;
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
+	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
 	parent_class = g_type_class_peek_parent (class);
 
 	object_class->dispose  = impl_dispose;
-- 
cgit v1.2.3