diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 14 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 5 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 2 | ||||
| -rw-r--r-- | calendar/gui/memos-component.c | 5 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 5 |
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; |