aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorTakao Fujiwara <takao.fujiwara@sun.com>2009-01-09 15:36:29 +0800
committerTakao Fujiwara <fujiwarat@src.gnome.org>2009-01-09 15:36:29 +0800
commit607ce3802eabee692e55d89aacefd06390819e07 (patch)
tree9e8ee80a01743f5d008f1c929c4a66ca36eccf5c /calendar
parentd5b6abdb006909c4cc7de585b4bce2812f371e5b (diff)
downloadgsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar.gz
gsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar.zst
gsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.zip
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
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog14
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/calendar-component.c5
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
-rw-r--r--calendar/gui/memos-component.c5
-rw-r--r--calendar/gui/tasks-component.c5
6 files changed, 28 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bffbf91e3e..504c1df694 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Matthew Barnes <mbarnes@redhat.com>
+
+ * Fix for bug #566011
+
+ * gui/Makefile.am:
+ * gui/calendar-component.c (calendar_component_class_init):
+ * gui/dialogs/comp-editor.c:
+ * gui/memos-component.c (memos_component_class_init):
+ * gui/tasks-component.c (tasks_component_class_init):
+ Include <glib/gi18n-lib.h> instead of <glib/gi18n.h> and
+ add bindtextdomain().
+
2009-01-07 Ashish Shrivastava <shashish@novell.com>
** Fix for bug #565553, #462372 (bnc)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index a6908118da..77f27cd71e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -55,6 +55,7 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(LIBSOUP_CFLAGS) \
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 705cedc862..0e1550b5f0 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <errno.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <libical/icalvcal.h>
@@ -1648,6 +1648,9 @@ calendar_component_class_init (CalendarComponentClass *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");
+
parent_class = g_type_class_peek_parent (class);
epv->upgradeFromVersion = impl_upgradeFromVersion;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 99d49349fd..c7db81e8bb 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
#include <libgnome/libgnome.h>
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 8ae51a5fb5..fea1a53fff 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <gconf/gconf-client.h>
@@ -1286,6 +1286,9 @@ memos_component_class_init (MemosComponentClass *klass)
POA_GNOME_Evolution_Component__epv *epv = &klass->epv;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
parent_class = g_type_class_peek_parent (klass);
epv->upgradeFromVersion = impl_upgradeFromVersion;
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 37c04f40c1..823b4ffa11 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -26,7 +26,7 @@
#include <errno.h>
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <gconf/gconf-client.h>
@@ -1348,6 +1348,9 @@ tasks_component_class_init (TasksComponentClass *klass)
POA_GNOME_Evolution_Component__epv *epv = &klass->epv;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
parent_class = g_type_class_peek_parent (klass);
epv->upgradeFromVersion = impl_upgradeFromVersion;