diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
| commit | 5030d911084584f9b37aeaa916ab43130044edbf (patch) | |
| tree | 0f0e400aa2c575c3fcdfcceaa6012d2f760e525e /navit/plugin | |
| parent | 449e5530c4ee68f77691c811f0670cf90e9e58a4 (diff) | |
| parent | 59bbe485ba74a6df5ec944275ae28fc1bd98981e (diff) | |
| download | navit-5030d911084584f9b37aeaa916ab43130044edbf.tar.gz | |
Merge branch 'trunk' into trac/1341trac/1341
Conflicts:
navit/Makefile.am
navit/xpm/Makefile.am
po/Makefile.am
Diffstat (limited to 'navit/plugin')
| -rw-r--r-- | navit/plugin/j1850/j1850.c | 2 | ||||
| -rw-r--r-- | navit/plugin/pedestrian/pedestrian.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/navit/plugin/j1850/j1850.c b/navit/plugin/j1850/j1850.c index b4648bcfe..26e18057d 100644 --- a/navit/plugin/j1850/j1850.c +++ b/navit/plugin/j1850/j1850.c @@ -502,5 +502,5 @@ plugin_init(void) struct attr callback,navit; struct attr_iter *iter; - plugin_register_osd_type("j1850", osd_j1850_new); + plugin_register_category_osd("j1850", osd_j1850_new); } diff --git a/navit/plugin/pedestrian/pedestrian.c b/navit/plugin/pedestrian/pedestrian.c index 444543694..7e5a4361d 100644 --- a/navit/plugin/pedestrian/pedestrian.c +++ b/navit/plugin/pedestrian/pedestrian.c @@ -1369,8 +1369,8 @@ plugin_init(void) (*jnienv)->CallVoidMethod(jnienv, android_activity, Activity_setRequestedOrientation, 0); #endif - plugin_register_osd_type("marker", osd_marker_new); - plugin_register_map_type("route_occluded", map_route_occluded_new); + plugin_register_category_osd("marker", osd_marker_new); + plugin_register_category_map("route_occluded", map_route_occluded_new); callback.type=attr_callback; callback.u.callback=callback_new_attr_0(callback_cast(pedestrian_navit), attr_navit); config_add_attr(config, &callback); |