--- a/mcabber/src/screen.c Sun Dec 02 10:36:42 2007 +0100
+++ b/mcabber/src/screen.c Sun Dec 02 13:04:57 2007 +0100
@@ -25,11 +25,17 @@
#include <string.h>
#include <time.h>
#include <ctype.h>
+
+#include <config.h>
#include <locale.h>
-#include <langinfo.h>
-#include <config.h>
#include <assert.h>
+#ifdef HAVE_LOCALCHARSET_H
+# include <localcharset.h>
+#else
+# include <langinfo.h>
+#endif
+
#ifdef HAVE_ASPELL_H
# include <aspell.h>
#endif
@@ -734,7 +740,11 @@
void scr_InitLocaleCharSet(void)
{
setlocale(LC_CTYPE, "");
+#ifdef HAVE_LOCALCHARSET_H
+ LocaleCharSet = locale_charset();
+#else
LocaleCharSet = nl_langinfo(CODESET);
+#endif
utf8_mode = (strcmp(LocaleCharSet, "UTF-8") == 0);
}