diff options
author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-29 12:28:13 +0000 |
---|---|---|
committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-29 12:28:13 +0000 |
commit | 15fb781bf2323f4985415f1b2e62c2d9d78ac2c1 (patch) | |
tree | ffba75d097c950307300a56c4acc9b63700aecf9 | |
parent | ee75fa2d8a67e2d38ce4f824b8c0b8d054760037 (diff) | |
download | navit-15fb781bf2323f4985415f1b2e62c2d9d78ac2c1.tar.gz |
Fix:core:Modified bookmarks object creation semantics
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3209 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | navit/bookmarks.c | 7 | ||||
-rw-r--r-- | navit/bookmarks.h | 2 | ||||
-rw-r--r-- | navit/navit.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/navit/bookmarks.c b/navit/bookmarks.c index 289fba6ac..8a0a6e155 100644 --- a/navit/bookmarks.c +++ b/navit/bookmarks.c @@ -27,6 +27,7 @@ #include "transform.h" #include "callback.h" #include "map.h" +#include "command.h" #include "bookmarks.h" struct bookmarks { @@ -194,8 +195,9 @@ bookmarks_load_hash(struct bookmarks *this_) { } bookmarks_move_root(this_); } + struct bookmarks * -bookmarks_new(struct attr *parent, /*struct attr **attrs,*/struct transformation *trans) { +bookmarks_new(struct attr *parent, struct attr **attrs, struct transformation *trans) { struct bookmarks *this_; this_ = g_new0(struct bookmarks,1); @@ -556,9 +558,6 @@ bookmarks_delete_bookmark(struct bookmarks *this_, const char *label) { int bookmarks_rename_bookmark(struct bookmarks *this_, const char *oldName, const char* newName) { - struct bookmark_item_priv *b_item; - struct pcoord pc; - char *path; int result; bookmarks_item_rewind(this_); diff --git a/navit/bookmarks.h b/navit/bookmarks.h index 2f379063e..792d2fe64 100644 --- a/navit/bookmarks.h +++ b/navit/bookmarks.h @@ -26,7 +26,7 @@ extern "C" { /* prototypes */ struct bookmarks; -struct bookmarks *bookmarks_new(struct attr *parent,/* struct attr **attrs,*/ struct transformation *trans); +struct bookmarks *bookmarks_new(struct attr *parent, struct attr **attrs, struct transformation *trans); void bookmarks_destroy(struct bookmarks *this_); void bookmarks_add_callback(struct bookmarks *this_, struct callback *cb); diff --git a/navit/navit.c b/navit/navit.c index f354757dc..673fc3091 100644 --- a/navit/navit.c +++ b/navit/navit.c @@ -739,7 +739,7 @@ navit_new(struct attr *parent, struct attr **attrs) transform_setup(this_->trans, ¢er, zoom, (this_->orientation != -1) ? this_->orientation : 0); - this_->bookmarks=bookmarks_new(&this_->self, this_->trans); + this_->bookmarks=bookmarks_new(&this_->self, NULL, this_->trans); this_->prevTs=0; |