Re: [evolution-patches] fix for bug #44991

[Jeffrey Stedfast <fejj ximian com>]

er, let me rip out all the other cruft from other patches. sorry about
that.

new patch attached

Jeff

On Tue, 2003-06-17 at 15:15, Jeffrey Stedfast wrote:
> Use e-iconv rather than relying on the charset menu's string to be the
> correct alias.
> 
> Jeff
-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 44991.patch
? composer.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.542
diff -u -r1.542 ChangeLog
--- ChangeLog	17 Jun 2003 19:47:53 -0000	1.542
+++ ChangeLog	17 Jun 2003 19:49:00 -0000
@@ -1,3 +1,8 @@
+2003-06-17  Jeffrey Stedfast  <fejj ximian com>
+
+	* e-msg-composer.c (best_encoding): Use e_iconv_open/close so that
+	we get charset aliasing for free. Fixes bug #44991.
+
 2003-06-16  Jeffrey Stedfast  <fejj ximian com>
 
 	Fixes bug #44139.
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.394
diff -u -r1.394 e-msg-composer.c
--- e-msg-composer.c	17 Jun 2003 19:47:53 -0000	1.394
+++ e-msg-composer.c	17 Jun 2003 19:49:10 -0000
@@ -202,7 +202,7 @@
 	if (!charset)
 		return -1;
 	
-	cd = iconv_open (charset, "utf-8");
+	cd = e_iconv_open (charset, "utf-8");
 	if (cd == (iconv_t) -1)
 		return -1;
 	
@@ -217,7 +217,7 @@
 				count++;
 		}
 	} while (status == (size_t) -1 && errno == E2BIG);
-	iconv_close (cd);
+	e_iconv_close (cd);
 	
 	if (status == (size_t) -1)
 		return -1;