From 645b266e92b8bde43e4d40057b191c806c36cdd7 Mon Sep 17 00:00:00 2001
From: Kaj-Michael Lang <milang@angel.tal.org>
Date: Fri, 27 Jul 2007 10:47:38 +0300
Subject: [PATCH] Call osm_init/osm_deinit

---
 src/mapper.c    | 1 +
 src/ui-common.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/mapper.c b/src/mapper.c
index 1aa3ee1..816e1c7 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -176,6 +176,7 @@ void mapper_destroy(void)
 	rcvr_disconnect();
 	/* _program and widgets have already been destroyed. */
 
+	osm_deinit();
 	db_close(&_db);
 
 	MACRO_PATH_FREE(_track);
diff --git a/src/ui-common.c b/src/ui-common.c
index 65f4e69..a26b31d 100644
--- a/src/ui-common.c
+++ b/src/ui-common.c
@@ -951,6 +951,7 @@ void mapper_init(gint argc, gchar ** argv)
 	hildon_program_set_common_toolbar(_program, _toolbar);
 
 	gtk_widget_show_all(notebook);
+	gtk_widget_show_all(_toolbar);
 #else
 	vbox_main = gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(_window), vbox_main);
@@ -1183,6 +1184,8 @@ void mapper_init(gint argc, gchar ** argv)
 
 	menu_init();
 
+	osm_init();
+
 	/* If present, attempt to load the file specified on the command line. */
 	if (argc > 1) {
 		GnomeVFSResult vfs_result;
-- 
2.39.5