summaryrefslogtreecommitdiffstats
path: root/gtk-gui.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-01-17 10:59:43 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-01-17 11:17:48 -0800
commitd0d4bbece7e0a304a3e1f1fcea3608f3d741e8fa (patch)
tree3b2588afc37b40b49c5173921f8c871bb1024479 /gtk-gui.c
parent91d6d12416086e08f97dece728ec9a6d08554230 (diff)
downloadsubsurface-d0d4bbece7e0a304a3e1f1fcea3608f3d741e8fa.tar.gz
Hack Makefile, gtk-gui.c and divelist.c to allow building w/o osm-gps-map
While we are waiting for an autotools generated Makefile, this should allow people to build that don't have osm-gps-map. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'gtk-gui.c')
-rw-r--r--gtk-gui.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk-gui.c b/gtk-gui.c
index d21fac585..304dea344 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -1062,7 +1062,9 @@ static GtkActionEntry menu_items[] = {
{ "Preferences", GTK_STOCK_PREFERENCES, N_("Preferences..."), PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) },
{ "Renumber", NULL, N_("Renumber..."), NULL, NULL, G_CALLBACK(renumber_dialog) },
{ "YearlyStats", NULL, N_("Yearly Statistics"), NULL, NULL, G_CALLBACK(show_yearly_stats) },
+#if HAVE_OSM_GPS_MAP
{ "DivesLocations", NULL, N_("Dives Locations"), CTRLCHAR "M", NULL, G_CALLBACK(show_gps_locations) },
+#endif
{ "SelectEvents", NULL, N_("Select Events..."), NULL, NULL, G_CALLBACK(selectevents_dialog) },
{ "Quit", GTK_STOCK_QUIT, N_("Quit"), CTRLCHAR "Q", NULL, G_CALLBACK(quit) },
{ "About", GTK_STOCK_ABOUT, N_("About Subsurface"), NULL, NULL, G_CALLBACK(about_dialog) },
@@ -1108,9 +1110,11 @@ static const gchar* ui_string = " \
<menuitem name=\"Renumber\" action=\"Renumber\" /> \
<menuitem name=\"Autogroup\" action=\"Autogroup\" /> \
<menuitem name=\"Toggle Zoom\" action=\"ToggleZoom\" /> \
- <menuitem name=\"YearlyStats\" action=\"YearlyStats\" /> \
- <menuitem name=\"DivesLocations\" action=\"DivesLocations\" /> \
- <menu name=\"View\" action=\"ViewMenuAction\"> \
+ <menuitem name=\"YearlyStats\" action=\"YearlyStats\" /> "
+#if HAVE_OSM_GPS_MAP
+ "<menuitem name=\"DivesLocations\" action=\"DivesLocations\" /> "
+#endif
+ "<menu name=\"View\" action=\"ViewMenuAction\"> \
<menuitem name=\"List\" action=\"ViewList\" /> \
<menuitem name=\"Profile\" action=\"ViewProfile\" /> \
<menuitem name=\"Info\" action=\"ViewInfo\" /> \