Fix:Core:Remove out-ifdefed code, which no longer makes sense, but breaks cscope.

[profile/ivi/navit.git] / navit / navit / navit.c

diff --git a/navit/navit/navit.c b/navit/navit/navit.c
index fcc8471..99b5da6 100644 (file)
--- a/navit/navit/navit.c
+++ b/navit/navit/navit.c
@@ -988,6 +988,7 @@ navit_cmd_get_attr_var(struct navit *this, char *function, struct attr **in, str
        struct attr **list = g_new0(struct attr *,2);
        if(!cmd_int_var_hash) {
                struct attr*val = g_new0(struct attr,1);
+               cmd_attr_var_hash = g_hash_table_new(g_str_hash, g_str_equal);
                val->type   = attr_type_item_begin;
                val->u.item = NULL;
                list[0]     = val;
@@ -1025,6 +1026,7 @@ navit_cmd_get_int_var(struct navit *this, char *function, struct attr **in, stru
        struct attr **list = g_new0(struct attr *,2);
        if(!cmd_int_var_hash) {
                struct attr*val = g_new0(struct attr,1);
+               cmd_int_var_hash = g_hash_table_new(g_str_hash, g_str_equal);
                val->type   = attr_type_int_begin;
                val->u.num  = 0;
                list[0]     = val;
@@ -1032,7 +1034,7 @@ navit_cmd_get_int_var(struct navit *this, char *function, struct attr **in, stru
        if (in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str) {
                struct attr*ret = g_hash_table_lookup(cmd_int_var_hash, in[0]->u.str);
                 if(ret) {
-                       list[0] = ret;
+                       list[0] = attr_dup(ret);
                }
                else {
                        struct attr*val = g_new0(struct attr,1);
@@ -1472,14 +1474,12 @@ navit_set_destination(struct navit *this_, struct pcoord *c, const char *descrip
                this_->destination=*c;
                this_->destination_valid=1;
 
-           dbg(1, "navit->navit_set_destination %i\n", c->x);
-           dbg(1, "navit->navit_set_destination %i\n", c->y);
-
+               dbg(1, "c=(%i,%i)\n", c->x,c->y);
+               destination_file = bookmarks_get_destination_file(TRUE);
+               bookmarks_append_coord(this_->former_destination, destination_file, c, type_former_destination, description, this_->recentdest_count);
+               g_free(destination_file);
        } else
                this_->destination_valid=0;
-       destination_file = bookmarks_get_destination_file(TRUE);
-       bookmarks_append_coord(this_->bookmarks, destination_file, c, 1, "former_destination", description, NULL, this_->recentdest_count);
-       g_free(destination_file);
        callback_list_call_attr_0(this_->attr_cbl, attr_destination);
        if (this_->route) {
                route_set_destination(this_->route, c, async);
@@ -1504,11 +1504,12 @@ navit_set_destinations(struct navit *this_, struct pcoord *c, int count, const c
        if (c && count) {
                this_->destination=c[count-1];
                this_->destination_valid=1;
+
+               destination_file = bookmarks_get_destination_file(TRUE);
+               bookmarks_append_coord(this_->former_destination, destination_file, c, type_former_itinerary, description, this_->recentdest_count);
+               g_free(destination_file);
        } else
                this_->destination_valid=0;
-       destination_file = bookmarks_get_destination_file(TRUE);
-       bookmarks_append_coord(this_->bookmarks, destination_file, c, count, "former_itinerary", description, NULL, this_->recentdest_count);
-       g_free(destination_file);
        callback_list_call_attr_0(this_->attr_cbl, attr_destination);
        if (this_->route) {
                route_set_destinations(this_->route, c, count, async);
@@ -1809,6 +1810,7 @@ navit_window_roadbook_destroy(struct navit *this_)
 {
        dbg(0, "enter\n");
        navigation_unregister_callback(this_->navigation, attr_navigation_long, this_->roadbook_callback);
+       callback_destroy(this_->roadbook_callback);
        this_->roadbook_window=NULL;
        this_->roadbook_callback=NULL;
 }
@@ -2205,16 +2207,6 @@ navit_set_center_screen(struct navit *this_, struct point *p, int set_timeout)
        navit_set_center(this_, &pc, set_timeout);
 }
 
-#if 0
-               switch((*attrs)->type) {
-               case attr_zoom:
-                       zoom=(*attrs)->u.num;
-                       break;
-               case attr_center:
-                       g=*((*attrs)->u.coord_geo);
-                       break;
-#endif
-
 static int
 navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 {
@@ -2839,7 +2831,7 @@ navit_vehicle_update(struct navit *this_, struct navit_vehicle *nv)
                        route_remove_waypoint(this_->route);
                        count=route_get_destinations(this_->route, pc, 16);
                        destination_file = bookmarks_get_destination_file(TRUE);
-                       bookmarks_append_coord(this_->bookmarks, destination_file, pc, count, "former_itinerary_part", NULL, NULL, this_->recentdest_count);
+                       bookmarks_append_coord(this_->former_destination, destination_file, pc, type_former_itinerary_part, NULL, this_->recentdest_count);
                        break;  
                case 2:
                        navit_set_destination(this_, NULL, NULL, 0);