* use the new regular way to get the accept language header

[citadel.git] / webcit / setup.c

diff --git a/webcit/setup.c b/webcit/setup.c
index d4267aec932b913400500e7361a8e1660ff4605b..f93abb22dc25942e38ba1279fc01bf856e84bf60 100644 (file)
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -23,15 +23,17 @@ char suggested_url[SIZ];
 
 /* some copies... */
 int lprintf(int loglevel, const char *format, ...){return 0;}
+void wc_printf(const char *format,...){}
+
 void RegisterNS(const char *NSName, long len, 
                int nMinArgs, 
                int nMaxArgs, 
                WCHandlerFunc HandlerFunc,
+               WCPreevalFunc PreEvalFunc,
                int ContextRequired){}
+void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F){}
 pthread_key_t MyConKey;
 
-#include "wc_gettext.h"
-
 #ifdef ENABLE_NLS
 
 #ifdef HAVE_USELOCALE 
@@ -252,9 +254,10 @@ void set_value(char *prompt, char str[])
 }
 
 
-
+extern const char *AvailLang[];
 int GetLocalePrefs(void)
 {
+       int nLocales;
        StrBuf *Buf;
        char buf[SIZ];
        char dialog_result[PATH_MAX];
@@ -263,6 +266,10 @@ int GetLocalePrefs(void)
        int offs = 0;
 
 
+       nLocales = 0; 
+       while (!IsEmptyStr(AvailLang[nLocales]))
+               nLocales++;
+
        Buf = NewStrBuf();
 
        StrBufAppendBufPlain(Buf, HKEY("Select the locale webcit should use : \n"), 0);
@@ -270,7 +277,7 @@ int GetLocalePrefs(void)
        StrBufAppendBufPlain(Buf, HKEY(" 0 Let the user select it at the login prompt (default)\n"), 0);
        offs ++;
 #endif
-       for (i = 0; i < NUM_LANGS; i++) {
+       for (i = 0; i < nLocales; i++) {
                StrBufAppendPrintf(Buf, " %ld: %s\n", i + offs, AvailLang[i]);
 
        }