Replaced g_utf8_strlen() with strlen()

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@545 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/support.c b/support.c
index bf60132775aebd3829ba87f7c5fa002f621c6c74..b55fc0ac79af3b2bf1a27e8e15196deeac584bf7 100644 (file)
--- a/support.c
+++ b/support.c
@@ -1,4 +1,5 @@
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
@@ -115,7 +116,8 @@ charset_init(void)
   noconvert = g_get_charset(&charset);
 
 #ifdef DEBUG
-  g_printerr("charset: %s\n", charset);
+  g_printerr("charset: %s [%d]\n", charset, noconvert);
+  fflush(stderr);
 #endif
   
   return 0;
@@ -141,7 +143,7 @@ utf8_to_locale(char *utf8str)
   wb = 0; /* bytes written */
   error = NULL;
   str=g_locale_from_utf8(utf8str, 
-                        g_utf8_strlen(utf8str,-1), 
+                        strlen(utf8str),
                         &wb, &rb,
                         &error);
   if( error )
@@ -168,7 +170,7 @@ locale_to_utf8(char *localestr)
   wb = 0; /* bytes written */
   error = NULL;
   str=g_locale_to_utf8(localestr, 
-                      -1, 
+                      strlen(localestr), 
                       &wb, &rb,
                       &error);
   if( error )