Call osm_init/osm_deinit

diff --git a/src/mapper.c b/src/mapper.c
index 1aa3ee1ea2ad5acfe9765b768dc4709110761195..816e1c715f6611e48f640777a3febc0291a7aab1 100644 (file)
--- 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 65f4e69bd6bf926ec0813a7d0ec88cc0b7975e9e..a26b31d5e6825bf0db154bc917f0e801a49cf9c5 100644 (file)
--- 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;