aboutsummaryrefslogtreecommitdiffstats
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
parentd5b6abdb006909c4cc7de585b4bce2812f371e5b (diff)
downloadgsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar
gsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar.gz
gsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar.bz2
gsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar.lz
gsoc2013-evolution-607ce3802eabee692e55d89aacefd06390819e07.tar.xz
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
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/gui/component/Makefile.am1
-rw-r--r--addressbook/gui/component/addressbook-component.c5
-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
-rw-r--r--composer/ChangeLog10
-rw-r--r--composer/e-composer-header-table.c2
-rw-r--r--composer/e-composer-private.h2
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/mail-component.c5
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/e-user-creatable-items-handler.c5
-rw-r--r--widgets/ChangeLog10
-rw-r--r--widgets/misc/e-charset-picker.c2
-rw-r--r--widgets/misc/e-signature-combo-box.c6
19 files changed, 102 insertions, 11 deletions
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;
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;
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 28e93ecd25..cfafbca1bd 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Matthew Barnes <mbarnes@redhat.com>
+
+ * Fix for bug #566011
+
+ * e-composer-header-table.c:
+ * e-composer-private.h:
+ Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.
+
2008-12-18 Matthew Barnes <mbarnes@redhat.com>
* e-composer-actions.c:
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index cef643b6f8..461c11efa1 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -18,7 +18,7 @@
#include "e-composer-header-table.h"
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <libedataserverui/e-name-selector.h>
#include "e-signature-combo-box.h"
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 2dc9ddb6cd..f68b32c414 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -20,7 +20,7 @@
#include "e-msg-composer.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <camel/camel-iconv.h>
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d339229443..77f9b72c27 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Matthew Barnes <mbarnes@redhat.com>
+
+ * Fix for bug #566011
+
+ * mail-component.c (mail_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 #565376
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 2a908ee7e5..12b4019429 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>
@@ -1240,6 +1240,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;
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0c73582af6..0d3425de44 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Matthew Barnes <mbarnes@redhat.com>
+
+ * Fix for bug #566011
+
+ * 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().
+
2009-01-01 Andre Klapper <a9016009@gmx.de>
* e-shell-window-commands.c:
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index e532382f2d..4ba247342c 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -36,7 +36,7 @@
#include <bonobo/bonobo-control.h>
#include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <stdlib.h>
#include <ctype.h>
@@ -838,6 +838,9 @@ e_user_creatable_items_handler_class_init (EUserCreatableItemsHandlerClass *klas
{
GObjectClass *object_class;
+ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
object_class = G_OBJECT_CLASS (klass);
object_class->dispose = impl_dispose;
object_class->finalize = impl_finalize;
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 296d3210d5..fea34cfe49 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com>
+
+ Reviewed by Matthew Barnes <mbarnes@redhat.com>
+
+ * Fix for bug #566011
+
+ * misc/e-charset-picker.c:
+ * misc/e-signature-combo-box.c:
+ Include <glib/gi18n-lib.h> instead of <glib/gi18n.h>.
+
2008-11-03 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #559041
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 03014609ae..cf3f758ce7 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <iconv.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <bonobo/bonobo-ui-node.h>
#include <bonobo/bonobo-ui-util.h>
diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c
index 199a3ad51a..9ebd20a0b2 100644
--- a/widgets/misc/e-signature-combo-box.c
+++ b/widgets/misc/e-signature-combo-box.c
@@ -18,9 +18,13 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "e-signature-combo-box.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#define E_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 10:59:25 +0800