Some more bits for UTF-8 support.

SVN revision: 9560

src/E.h

@@ -2275,6 +2275,10 @@ void                SetupFallbackClasses(void);
 int                 HandleIPC(const char *params, Client * c);
 void                ButtonIPC(int val, void *data);
 
+/* lang.c */
+void                LangInit(void);
+char               *Eiconv(const char *txt, size_t len);
+
 /* lists.c */
 void               *FindItem(const char *name, int id, int find_by, int type);
 void                AddItem(void *item, const char *name, int id, int type);

src/Makefile.am

@@ -50,6 +50,7 @@ enlightenment_SOURCES = \
 	iconify.c		\
 	init.c			\
 	ipc.c			\
+	lang.c			\
 	lists.c			\
 	main.c			\
 	memory.c		\

src/main.c

@@ -70,13 +70,8 @@ main(int argc, char **argv)
    single_screen_mode = 0;
 /*  unsetenv("LD_PRELOAD"); */
 
-/* Part of gettext stuff */
-
-   setlocale(LC_ALL, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
-
-/* End of gettext stuff */
+   /* Initialise internationalisation */
+   LangInit();
 
    str = getenv("EDBUG");
    if (str)

src/setup.c

@@ -291,15 +291,6 @@ SetupX()
 		 "server is one the author of Enlightenment neither have\n"
 		 "access to, nor have heard of.\n"), ProtocolVersion(disp));
      }
-   /* now we'll set the locale */
-   setlocale(LC_ALL, "");
-   if (!XSupportsLocale())
-      setlocale(LC_ALL, "C");
-   XSetLocaleModifiers("");
-   setlocale(LC_ALL, NULL);
-
-   /* I dont want any internationalisation of my numeric input & output */
-   setlocale(LC_NUMERIC, "C");
 
    ICCCM_SetIconSizes();
    ICCCM_Focus(NULL);