--- a/src/lib-charset/charset-utf8.h	Fri Jul 20 02:45:32 2007 +0300
+++ b/src/lib-charset/charset-utf8.h	Fri Jul 20 06:03:45 2007 +0300
@@ -8,9 +8,9 @@
 	CHARSET_RET_INVALID_INPUT = -2
 };
 
-/* Begin translation to UTF-8. */
-struct charset_translation *charset_to_utf8_begin(const char *charset,
-						  bool *unknown_charset);
+/* Begin translation to UTF-8. If ucase=TRUE, returns data uppercased. */
+struct charset_translation *
+charset_to_utf8_begin(const char *charset, bool ucase, bool *unknown_charset_r);
 
 void charset_to_utf8_end(struct charset_translation **t);
 
@@ -22,15 +22,14 @@
 /* Translate src to UTF-8. src_size is updated to contain the number of
    characters actually translated from src. Note that dest buffer is used
    only up to its current size, for growing it automatically use
-   charset_to_ucase_utf8_full(). */
+   charset_to_utf8_full(). */
 enum charset_result
-charset_to_ucase_utf8(struct charset_translation *t,
-		      const unsigned char *src, size_t *src_size,
-		      buffer_t *dest);
+charset_to_utf8(struct charset_translation *t,
+		const unsigned char *src, size_t *src_size, buffer_t *dest);
 enum charset_result
-charset_to_ucase_utf8_full(struct charset_translation *t,
-			   const unsigned char *src, size_t *src_size,
-			   buffer_t *dest);
+charset_to_utf8_full(struct charset_translation *t,
+		     const unsigned char *src, size_t *src_size,
+		     buffer_t *dest);
 
 /* Simple wrappers for above functions. If utf8_size is non-NULL, it's set
    to same as strlen(returned data). */