Merge branch 'upstream-svn' into upstream

[navit-package] / navit / main.c

diff --git a/navit/main.c b/navit/main.c
index 43e490f..0bc92a0 100644 (file)
--- a/navit/main.c
+++ b/navit/main.c
@@ -65,86 +65,6 @@ static void sigchld(int sig)
 #endif
 }
 
-static GList *navit;
-
-struct iter {
-       GList *list;
-};
-
-struct iter *
-main_iter_new(void)
-{
-       struct iter *ret=g_new0(struct iter, 1);
-       ret->list=navit;
-       return ret;
-}
-
-void
-main_iter_destroy(struct iter *iter)
-{
-       g_free(iter);
-}
-
-struct navit *
-main_get_navit(struct iter *iter)
-{
-       GList *list;
-       struct navit *ret=NULL;
-       if (iter)
-               list=iter->list;
-       else
-               list=navit;
-       if (list) {
-               ret=(struct navit *)(list->data);
-               if (iter)
-                       iter->list=g_list_next(iter->list);
-       }
-       return ret;
-
-}
-void
-main_add_navit(struct navit *nav)
-{
-       navit=g_list_prepend(navit, nav);
-       callback_list_call_2(cbl, nav, 1);
-}
-
-void
-main_remove_navit(struct navit *nav)
-{
-       navit=g_list_remove(navit, nav);
-       callback_list_call_2(cbl, nav, 0);
-       if (! navit)
-               event_main_loop_quit();
-}
-
-int
-main_add_attr(struct attr *attr)
-{
-       switch (attr->type)
-       {
-       case attr_callback:
-               callback_list_add(cbl, attr->u.callback);
-               return 1;
-       default:
-               return 0;
-       }
-}
-
-int
-main_remove_attr(struct attr *attr)
-{
-       switch (attr->type)
-       {
-       case attr_callback:
-               callback_list_remove(cbl, attr->u.callback);
-               return 1;
-       default:
-               return 0;
-       }
-}
-
-
 #ifdef HAVE_API_WIN32
 void
 setenv(char *var, char *val, int overwrite)
@@ -208,11 +128,14 @@ main_setup_environment(int mode)
 
 #ifdef HAVE_API_WIN32_BASE
 char *nls_table[][3]={
+       {"DAN","DNK","da_DK"},
        {"DEU","DEU","de_DE"},
        {"DEA","AUT","de_AT"},
+       {"ENU","USA","en_US"},
+       {"FRA","FRA","fr_FR"},
+       {"RUS","RUS","ru_RU"},
        {NULL,NULL,NULL},
 };
-#endif
 
 static void
 win_set_nls(void)
@@ -227,14 +150,15 @@ win_set_nls(void)
        WideCharToMultiByte(CP_ACP,0,wcountry,-1,country,sizeof(country),NULL,NULL);
        while (nls_table[i][0]) {
                if (!strcmp(nls_table[i][0], lang) && !(strcmp(nls_table[i][1], country))) {
-                       dbg(0,"Setting LANG=%s for Lang %s Country %s\n",nls_table[i][2], lang, country);
-                       setenv("LANG",nls_table[i][2]);
+                       dbg(1,"Setting LANG=%s for Lang %s Country %s\n",nls_table[i][2], lang, country);
+                       setenv("LANG",nls_table[i][2],0);
                        return;
                }
                i++;
        }
-       dbg(0,"Lang %s Country %s not found\n",lang,country);
+       dbg(1,"Lang %s Country %s not found\n",lang,country);
 }
+#endif
 
 void
 main_init(char *program)