Fix:maptool:Another name for faroe islands

[navit-package] / navit / plugin.c

diff --git a/navit/plugin.c b/navit/plugin.c
index 8849bc1..991eb50 100644 (file)
--- a/navit/plugin.c
+++ b/navit/plugin.c
@@ -217,9 +217,10 @@ plugin_new(struct attr *parent, struct attr **attrs) {
        char **array;
        char *name;
        struct plugin *pl=NULL;
-       struct plugins *pls;
+       struct plugins *pls=NULL;
 
-       pls=parent->u.plugins;
+       if (parent)
+               pls=parent->u.plugins;
 
        if (! (path_attr=attr_search(attrs, NULL, attr_path))) {
                dbg(0,"missing path\n");
@@ -244,21 +245,31 @@ plugin_new(struct attr *parent, struct attr **attrs) {
                for (i = 0 ; i < count ; i++) {
                        name=array[i];
                        dbg(2,"name[%d]='%s'\n", i, name);
-                       if (! (pl=g_hash_table_lookup(pls->hash, name))) {
+                       if (! (pls && (pl=g_hash_table_lookup(pls->hash, name)))) {
                                pl=plugin_new_from_path(name);
                                if (! pl) {
                                        dbg(0,"failed to create plugin '%s'\n", name);
                                        continue;
                                }
-                               g_hash_table_insert(pls->hash, plugin_get_name(pl), pl);
-                               pls->list=g_list_append(pls->list, pl);
+                               if (pls) {
+                                       g_hash_table_insert(pls->hash, plugin_get_name(pl), pl);
+                                       pls->list=g_list_append(pls->list, pl);
+                               }
                        } else {
-                               pls->list=g_list_remove(pls->list, pl);
-                               pls->list=g_list_append(pls->list, pl);
+                               if (pls) {
+                                       pls->list=g_list_remove(pls->list, pl);
+                                       pls->list=g_list_append(pls->list, pl);
+                               }
                        }
                        plugin_set_active(pl, active);
                        plugin_set_lazy(pl, lazy);
                        plugin_set_ondemand(pl, ondemand);
+                       if (!pls && active) {
+                               if (!plugin_load(pl)) 
+                                       plugin_set_active(pl, 0);
+                               else
+                                       plugin_call_init(pl);
+                       }
                }
                file_wordexp_destroy(we);
        }
@@ -308,7 +319,7 @@ plugins_destroy(struct plugins *pls)
        void *
 plugin_get_type(enum plugin_type type, const char *type_name, const char *name)
 {
-       dbg(0, "type=\"%s\", name=\"%s\"\n", type_name, name);
+       dbg(1, "type=\"%s\", name=\"%s\"\n", type_name, name);
        GList *l,*lpls;
        struct name_val *nv;
        struct plugin *pl;