MapIntegration: A bit more work

[mapper] / src / cb.c

diff --git a/src/cb.c b/src/cb.c
index 57979e7935c90407caad70614192ed71347561f4..afe97fbaa68c7404061a1bb379444132ccab357d 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -109,14 +109,14 @@ return TRUE;
 gboolean 
 menu_cb_route_distnext(GtkAction *action)
 {
-route_show_distance_to_next(_route);
+path_show_distance_to_next(_route);
 return TRUE;
 }
 
 gboolean 
 menu_cb_route_distlast(GtkAction *action)
 {
-route_show_distance_to_last(_route);
+path_show_distance_to_last(_route);
 return TRUE;
 }
 
@@ -125,7 +125,6 @@ menu_cb_route_reset(GtkAction *action)
 {
 path_find_nearest_point(_route);
 gtk_map_refresh(_map);
-MACRO_QUEUE_DRAW_AREA();
 return TRUE;
 }
 
@@ -169,7 +168,7 @@ return TRUE;
 gboolean 
 menu_cb_track_insert_mark(GtkAction *action)
 {
-if (track_insert_mark(_track)) {
+if (path_insert_mark(_track)) {
        path_tree_view_update_store(track_tree_view, _track);
 }
 return TRUE;
@@ -178,21 +177,21 @@ return TRUE;
 gboolean 
 menu_cb_track_distlast(GtkAction *action)
 {
-track_show_distance_from_last(_track);
+path_show_distance_from_last(_track);
 return TRUE;
 }
 
 gboolean 
 menu_cb_track_distfirst(GtkAction *action)
 {
-track_show_distance_from_first(_track);
+path_show_distance_from_first(_track);
 return TRUE;
 }
 
 gboolean 
 menu_cb_track_clear(GtkAction *action)
 {
-track_clear(_track);
+path_clear(_track);
 path_tree_view_update_store(track_tree_view, _track);
 return TRUE;
 }
@@ -471,7 +470,7 @@ if ((_enable_gps = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
        if (_gps->io.conn > RCVR_OFF)
                gps_conn_set_state(_gps, RCVR_OFF);
        gps_disconnect(_gps);
-       track_add(_track, NULL);
+       path_add_break(_track);
        _speed_excess=FALSE;
 }
 if (_enable_gps==FALSE)
@@ -708,19 +707,19 @@ switch (_action[custom_key]) {
                }
        break;
        case CUSTOM_ACTION_ROUTE_DISTNEXT:
-               route_show_distance_to_next(_route);
+               path_show_distance_to_next(_route);
        break;
        case CUSTOM_ACTION_ROUTE_DISTLAST:
-               route_show_distance_to_last(_route);
+               path_show_distance_to_last(_route);
        break;
        case CUSTOM_ACTION_TRACK_BREAK:
                path_insert_break(_track);
        break;
        case CUSTOM_ACTION_TRACK_DISTLAST:
-               track_show_distance_from_last(_track);
+               path_show_distance_from_last(_track);
        break;
        case CUSTOM_ACTION_TRACK_DISTFIRST:
-               track_show_distance_from_first(_track);
+               path_show_distance_from_first(_track);
        break;
        case CUSTOM_ACTION_TOGGLE_GPS:
                set_action_activate("gps_enable", !_enable_gps);