Merge branch 'trunk' of github.com:navit-gps/navit into trunk

# Conflicts:
#	navit/navit.c

1 files changed, 4 insertions, 4 deletions

diff --git a/navit/navit.c b/navit/navit.c
index e54f5934b..b130ed967 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -2637,8 +2637,8 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 		this_->waypoints_flag=!!attr->u.num;
 		break;
 	default:
-		dbg(lvl_warning, "attribute type %s not supported by navit\n", attr_to_name(attr->type))
-		return 0;
+		dbg(lvl_debug, "calling generic setter method for attribute type %s\n", attr_to_name(attr->type))
+		return navit_object_set_attr((struct navit_object *) this_, attr);
 	}
 	if (attr_updated && !init) {
 		callback_list_call_attr_2(this_->attr_cbl, attr->type, this_, attr);
@@ -2855,8 +2855,8 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
 		attr->u.num=this_->waypoints_flag;
 		break;
 	default:
-		dbg(lvl_warning, "attribute type %s not supported by navit\n", attr_to_name(type))
-		return 0;
+		dbg(lvl_debug, "calling generic getter method for attribute type %s\n", attr_to_name(type))
+		return navit_object_get_attr((struct navit_object *) this_, type, attr, iter);
 	}
 	attr->type=type;
 	return ret;