Hide Help on !hildon case. Hide work-in-progress menu entries.

diff --git a/src/ui-common.c b/src/ui-common.c
index ce6e223face5cd21937a7bb69a99a0f71c963092..8782ca22fdd09ba102f4a9442c8dd12cbd489a27 100644 (file)
--- a/src/ui-common.c
+++ b/src/ui-common.c
@@ -30,7 +30,7 @@
 #include "mapper-types.h"
 #include "ui-common.h"
 #include "db.h"
-
+#include "gps-panels.h"
 #include "settings-gui.h"
 
 /* Callbacks */
@@ -124,11 +124,11 @@ static const gchar *mapper_ui =
 "    </menu>"
 "    <menu action='poi'>"
 "      <menuitem action='poi_categories'/>"
+#if 0
 "      <separator/>"
 "      <menuitem action='poi_import'/>"
 "      <menuitem action='poi_export'/>"
-"      <separator/>"
-"      <menuitem action='poi_settings'/>"
+#endif
 "    </menu>"
 "    <menu action='view'>"
 "      <menuitem action='view_zoom_in'/>"
@@ -159,11 +159,11 @@ static const gchar *mapper_ui =
 "    <menu action='gps'>"
 "      <menuitem action='gps_enabled'/>"
 "      <menuitem action='gps_information'/>"
-"      <separator/>"
-"      <menuitem action='gps_settings'/>"
 "    </menu>"
 "    <menu action='help'>"
+#if defined (WITH_OSSO_HELP) || defined(WITH_HILDON_HELP)
 "      <menuitem action='help_help'/>"
+#endif
 "      <menuitem action='help_about'/>"
 "    </menu>"
 "  </menubar>"
@@ -762,7 +762,7 @@ g_signal_connect(G_OBJECT(_window), "key_release_event", G_CALLBACK(window_cb_ke
 /* If we have a route, calculate the next point. */
 route_find_nearest_point();
 
-gps_show_info();
+gps_show_info(&_gps->data);
 
 gtk_idle_add((GSourceFunc)window_present, NULL);
 }