Re: Patch: UTF8 fixes for gnome-pilot 2.0.5

[Frederic Crozat <fcrozat mandrakesoft com>]

Le jeu 17/04/2003 à 17:16, Frederic Crozat a écrit :
> Hi,
> 
> while packaging evolution 1.3.2 for Mdk cooker, I've found some bugs in
> gnome-pilot 2.0.5 :
> 
> it lacks call to bind_textdomain_codeset when not using UTF-8 locales..
> The attached patch fixes the problem. Can I commit it to CVS ?


Grr, this time, patch is attached..
-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

--- gnome-pilot-2.0.5/capplet/gpilotd-control-applet.c.orig	2003-01-26 22:19:32.000000000 +0100
+++ gnome-pilot-2.0.5/capplet/gpilotd-control-applet.c	2003-04-17 16:31:53.000000000 +0200
@@ -78,6 +78,7 @@
 	
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	
 	if (argc > 1 && strcmp (argv[1], "--druid") == 0) {
 		gnome_init_with_popt_table ("gpilot-control-applet",
--- gnome-pilot-2.0.5/conduits/file/gpilot_install_file.c.orig	2003-03-24 17:53:16.000000000 +0100
+++ gnome-pilot-2.0.5/conduits/file/gpilot_install_file.c	2003-04-17 16:34:20.000000000 +0200
@@ -94,6 +94,7 @@
         
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	if (argc<2) {
 		g_message ("usage : %s [--now|--later] [FILE]", argv[0]);
--- gnome-pilot-2.0.5/gpilotd/gpilotd.c.orig	2003-04-17 16:03:37.000000000 +0200
+++ gnome-pilot-2.0.5/gpilotd/gpilotd.c	2003-04-17 16:33:37.000000000 +0200
@@ -1167,6 +1167,7 @@
 
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	/*g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
 				G_LOG_LEVEL_CRITICAL |
--- gnome-pilot-2.0.5/utils/gpilotd-client.c.orig	2003-03-19 18:15:13.000000000 +0100
+++ gnome-pilot-2.0.5/utils/gpilotd-client.c	2003-04-17 16:33:00.000000000 +0200
@@ -345,6 +345,7 @@
 	CORBA_Environment ev;
         poptContext pctx;
 	
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 
--- gnome-pilot-2.0.5/utils/gpilotdcm-client.c.orig	2002-11-22 17:04:02.000000000 +0100
+++ gnome-pilot-2.0.5/utils/gpilotdcm-client.c	2003-04-17 16:33:16.000000000 +0200
@@ -99,6 +99,7 @@
 	
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	gnome_init_with_popt_table ("gpilotdcm-client","1.0", argc, argv, options,0,&pctx);