[evolution-patches] [Mailer] Possible fix for #333213

["simon.zheng" <Simon Zheng Sun COM>]

Hi,

Bug 333213 â?? Can't specify the encoding as ISO-8859-15 in mail composer
on Solaris.
http://bugzilla.gnome.org/show_bug.cgi?id=333213

Attached a patch for review. 

Changing wrapper for iconv(). Translate non-zero value returned by
iconv() to -1.

Thanks,
-Simon

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.375
diff -u -p -r1.375 ChangeLog
--- ChangeLog	27 Feb 2006 11:16:46 -0000	1.375
+++ ChangeLog	2 Mar 2006 05:22:31 -0000
@@ -1,3 +1,9 @@
+2006-03-02  Simon Zheng  <simon zheng sun com>
+
+	* libedataserver/e-iconv.c: (e_iconv): In the case of non-identical
+	characters on Solaris, iconv() returns a positive value. So only
+	returning zero means success of conversation. 
+
 2006-02-27  Srinivasa Ragavan <sragavan novell com>
 
 	* configure.in, NEWS: Release updates. Bump version.

+#endif
Index: libedataserver/e-iconv.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-iconv.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-iconv.c
--- libedataserver/e-iconv.c	15 Sep 2005 22:39:47 -0000	1.4
+++ libedataserver/e-iconv.c	2 Mar 2006 05:22:32 -0000
@@ -541,7 +541,7 @@ iconv_t e_iconv_open(const char *oto, co
 
 size_t e_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char ** outbuf, size_t *outbytesleft)
 {
-	return iconv(cd, (char **) inbuf, inbytesleft, outbuf, outbytesleft);
+	return iconv(cd, (char **) inbuf, inbytesleft, outbuf, outbytesleft) ? (size_t)-1 : (size_t)0;
 }
 
 void