evolution r37021 - in trunk: addressbook addressbook/gui/component calendar calendar/gui calendar/gui/dialogs composer mail shell widgets widgets/misc

[fujiwarat svn gnome org]

Author: fujiwarat
Date: Fri Jan  9 07:36:29 2009
New Revision: 37021
URL: http://svn.gnome.org/viewvc/evolution?rev=37021&view=rev

Log:
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>.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/component/Makefile.am
   trunk/addressbook/gui/component/addressbook-component.c
   trunk/calendar/ChangeLog
   trunk/calendar/gui/Makefile.am
   trunk/calendar/gui/calendar-component.c
   trunk/calendar/gui/dialogs/comp-editor.c
   trunk/calendar/gui/memos-component.c
   trunk/calendar/gui/tasks-component.c
   trunk/composer/ChangeLog
   trunk/composer/e-composer-header-table.c
   trunk/composer/e-composer-private.h
   trunk/mail/ChangeLog
   trunk/mail/mail-component.c
   trunk/shell/ChangeLog
   trunk/shell/e-user-creatable-items-handler.c
   trunk/widgets/ChangeLog
   trunk/widgets/misc/e-charset-picker.c
   trunk/widgets/misc/e-signature-combo-box.c

Modified: trunk/addressbook/gui/component/Makefile.am
==============================================================================
--- trunk/addressbook/gui/component/Makefile.am	(original)
+++ trunk/addressbook/gui/component/Makefile.am	Fri Jan  9 07:36:29 2009
@@ -15,6 +15,7 @@
 	-I$(top_srcdir)/addressbook/gui/widgets			\
 	-I$(top_srcdir)/a11y/addressbook			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
 	-DPREFIX=\""$(prefix)"\"				\
 	$(LDAP_CFLAGS)						\

Modified: trunk/addressbook/gui/component/addressbook-component.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-component.c	(original)
+++ trunk/addressbook/gui/component/addressbook-component.c	Fri Jan  9 07:36:29 2009
@@ -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 @@
 	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;

Modified: trunk/calendar/gui/Makefile.am
==============================================================================
--- trunk/calendar/gui/Makefile.am	(original)
+++ trunk/calendar/gui/Makefile.am	Fri Jan  9 07:36:29 2009
@@ -55,6 +55,7 @@
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(LIBSOUP_CFLAGS)				\

Modified: trunk/calendar/gui/calendar-component.c
==============================================================================
--- trunk/calendar/gui/calendar-component.c	(original)
+++ trunk/calendar/gui/calendar-component.c	Fri Jan  9 07:36:29 2009
@@ -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 @@
 	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;

Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c	(original)
+++ trunk/calendar/gui/dialogs/comp-editor.c	Fri Jan  9 07:36:29 2009
@@ -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>

Modified: trunk/calendar/gui/memos-component.c
==============================================================================
--- trunk/calendar/gui/memos-component.c	(original)
+++ trunk/calendar/gui/memos-component.c	Fri Jan  9 07:36:29 2009
@@ -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 @@
 	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;

Modified: trunk/calendar/gui/tasks-component.c
==============================================================================
--- trunk/calendar/gui/tasks-component.c	(original)
+++ trunk/calendar/gui/tasks-component.c	Fri Jan  9 07:36:29 2009
@@ -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 @@
 	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;

Modified: trunk/composer/e-composer-header-table.c
==============================================================================
--- trunk/composer/e-composer-header-table.c	(original)
+++ trunk/composer/e-composer-header-table.c	Fri Jan  9 07:36:29 2009
@@ -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"

Modified: trunk/composer/e-composer-private.h
==============================================================================
--- trunk/composer/e-composer-private.h	(original)
+++ trunk/composer/e-composer-private.h	Fri Jan  9 07:36:29 2009
@@ -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>

Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c	(original)
+++ trunk/mail/mail-component.c	Fri Jan  9 07:36:29 2009
@@ -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 @@
 	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;

Modified: trunk/shell/e-user-creatable-items-handler.c
==============================================================================
--- trunk/shell/e-user-creatable-items-handler.c	(original)
+++ trunk/shell/e-user-creatable-items-handler.c	Fri Jan  9 07:36:29 2009
@@ -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 @@
 {
 	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;

Modified: trunk/widgets/misc/e-charset-picker.c
==============================================================================
--- trunk/widgets/misc/e-charset-picker.c	(original)
+++ trunk/widgets/misc/e-charset-picker.c	Fri Jan  9 07:36:29 2009
@@ -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>

Modified: trunk/widgets/misc/e-signature-combo-box.c
==============================================================================
--- trunk/widgets/misc/e-signature-combo-box.c	(original)
+++ trunk/widgets/misc/e-signature-combo-box.c	Fri Jan  9 07:36:29 2009
@@ -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 \