Add:Core:Changed vehicleprofile to new scheme
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Mon, 16 Jul 2012 12:18:19 +0000 (12:18 +0000)
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Mon, 16 Jul 2012 12:18:19 +0000 (12:18 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5193 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/xmlconfig.c
navit/navit/xmlconfig.h

index 9dd102c..616c8d3 100644 (file)
@@ -266,7 +266,6 @@ static struct object_func object_funcs[] = {
        { attr_route,      NEW(route_new), GET(route_get_attr), NULL, NULL, SET(route_set_attr), ADD(route_add_attr), REMOVE(route_remove_attr)},
        { attr_speech,     NEW(speech_new), GET(speech_get_attr), NULL, NULL, SET(speech_set_attr)},
        { attr_text,       NEW(text_new)},
-       { attr_vehicleprofile, NEW(vehicleprofile_new),  GET(vehicleprofile_get_attr), NULL, NULL, SET(vehicleprofile_set_attr), ADD(vehicleprofile_add_attr) },
 };
 
 struct object_func *
@@ -288,6 +287,8 @@ object_func_lookup(enum attr_type type)
                return &tracking_func;
        case attr_vehicle:
                return &vehicle_func;
+       case attr_vehicleprofile:
+               return &vehicleprofile_func;
        default:
                for (i = 0 ; i < sizeof(object_funcs)/sizeof(struct object_func); i++) {
                        if (object_funcs[i].type == type)
index a984105..e916eb4 100644 (file)
@@ -54,7 +54,7 @@ struct object_func {
        void *(*unref)(void *);
 };
 
-extern struct object_func map_func, mapset_func, navit_func, tracking_func, vehicle_func, maps_func, layout_func;
+extern struct object_func map_func, mapset_func, navit_func, tracking_func, vehicle_func, maps_func, layout_func, vehicleprofile_func;
 
 #define HAS_OBJECT_FUNC(x) ((x) == attr_map || (x) == attr_mapset || (x) == attr_navit || (x) == attr_trackingo || (x) == attr_vehicle)