@@ -108,11 +108,11 @@
 
 	return utf8;
 }
 
 size_t
-of_string_unicode_to_utf8(uint32_t c, char *buf)
+of_string_unicode_to_utf8(of_unichar_t c, char *buf)
 {
 	size_t i = 0;
 
 	if (c < 0x80) {
 		buf[i] = c;
@@ -297,11 +297,11 @@
 		for (i = j = 0; i < len; i++) {
 			if ((uint8_t)str[i] < 0x80)
 				string[j++] = str[i];
 			else {
 				char buf[4];
-				uint32_t chr;
+				of_unichar_t chr;
 				size_t chr_bytes;
 
 				switch (encoding) {
 				case OF_STRING_ENCODING_ISO_8859_1:
 					chr = (uint8_t)str[i];