[evolution-patches] fix for #301116, e-d-s libedataserverui library i18n



Patch for #301116, branch gnome-2-10.

* include glib/gi18n-lib.h instead of libgnome/gnome-i18n.h to use
explicit translation domain without GNOME_EXPLICIT_TRANSLATION_DOMAIN
define.
* specify the domain in glade_xml_new().

Thanks,
-- 
Changwoo Ryu <cwryu debian org>
Index: libedataserverui/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/ChangeLog,v
retrieving revision 1.31.4.3
diff -u -p -r1.31.4.3 ChangeLog
--- libedataserverui/ChangeLog	8 Apr 2005 13:30:48 -0000	1.31.4.3
+++ libedataserverui/ChangeLog	7 May 2005 21:06:58 -0000
@@ -1,3 +1,15 @@
+2005-05-08  Changwoo Ryu  <cwryu debian org>
+
+	Fixes #301116
+	
+	* e-passwords.c: include <glib/gi18n-lib.h> instead of
+	<libgnome/gnome-i18n.h>, to specify the translation domain
+	explicitly.
+
+	* e-categories-dialog.c (e_categories_dialog_init): specify the
+	translation domain on glade_xml_new().
+	* e-name-selector-dialog.c (e_name_selector_dialog_init): likewise.
+
 2005-04-04  Sivaiah Nallagatla <snallagatla novell com>
 
         * e-book-auth-util.c (load_source_auth_cb)
Index: libedataserverui/e-categories-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-categories-dialog.c,v
retrieving revision 1.12.4.2
diff -u -p -r1.12.4.2 e-categories-dialog.c
--- libedataserverui/e-categories-dialog.c	23 Mar 2005 11:17:59 -0000	1.12.4.2
+++ libedataserverui/e-categories-dialog.c	7 May 2005 21:06:58 -0000
@@ -72,7 +72,7 @@ load_properties_dialog (ECategoriesDialo
 
 	prop_dialog = g_new0 (CategoryPropertiesDialog, 1);
 
-	prop_dialog->gui = glade_xml_new (E_DATA_SERVER_UI_GLADEDIR "/e-categories-dialog.glade", "properties-dialog", NULL);
+	prop_dialog->gui = glade_xml_new (E_DATA_SERVER_UI_GLADEDIR "/e-categories-dialog.glade", "properties-dialog", GETTEXT_PACKAGE);
 	if (!prop_dialog->gui) {
 		g_free (prop_dialog);
 		return NULL;
@@ -346,7 +346,7 @@ e_categories_dialog_init (ECategoriesDia
 	dialog->priv = priv;
 
 	/* load the UI from our Glade file */
-	priv->gui = glade_xml_new (E_DATA_SERVER_UI_GLADEDIR "/e-categories-dialog.glade", "table-categories", NULL);
+	priv->gui = glade_xml_new (E_DATA_SERVER_UI_GLADEDIR "/e-categories-dialog.glade", "table-categories", GETTEXT_PACKAGE);
 	if (!priv->gui) {
 		g_warning (G_STRLOC ": can't load e-categories-dialog.glade file");
 		return;
Index: libedataserverui/e-name-selector-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-dialog.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-name-selector-dialog.c
--- libedataserverui/e-name-selector-dialog.c	23 Feb 2005 18:52:12 -0000	1.11
+++ libedataserverui/e-name-selector-dialog.c	7 May 2005 21:06:59 -0000
@@ -95,7 +95,7 @@ e_name_selector_dialog_init (ENameSelect
 
 	/* Get Glade GUI */
 
-	name_selector_dialog->gui = glade_xml_new (E_DATA_SERVER_UI_GLADEDIR "/e-name-selector-dialog.glade", NULL, NULL);
+	name_selector_dialog->gui = glade_xml_new (E_DATA_SERVER_UI_GLADEDIR "/e-name-selector-dialog.glade", NULL, GETTEXT_PACKAGE);
 
 	widget = glade_xml_get_widget (name_selector_dialog->gui, "name-selector-box");
 	if (!widget) {
Index: libedataserverui/e-passwords.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-passwords.c,v
retrieving revision 1.26
diff -u -p -r1.26 e-passwords.c
--- libedataserverui/e-passwords.c	23 Feb 2005 18:52:12 -0000	1.26
+++ libedataserverui/e-passwords.c	7 May 2005 21:06:59 -0000
@@ -43,7 +43,7 @@
 
 #include <string.h>
 #include <libgnome/gnome-config.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtkversion.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkvbox.h>

Attachment: signature.asc
Description: This is a digitally signed message part



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]