diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-05-11 21:33:46 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-11 22:02:24 -0700 |
| commit | f5ef74202b8295400e5f26d1fa80b90223f822da (patch) | |
| tree | a513e68f368055bf2f194dc662fb4d87d2d2a889 /info-gtk.c | |
| parent | 5775905727150b4f2f5556b84814acdc46e2d717 (diff) | |
| download | subsurface-f5ef74202b8295400e5f26d1fa80b90223f822da.tar.gz | |
Require libzip, xslt and osm-gps-map in all builds
Conditional inclusion of libzip, xslt and osm-gps-map just
makes testing more cumbersome, since testers might lack
Subsurface features without knowing.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'info-gtk.c')
| -rw-r--r-- | info-gtk.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/info-gtk.c b/info-gtk.c index 4ed945791..39325f6f3 100644 --- a/info-gtk.c +++ b/info-gtk.c @@ -397,7 +397,6 @@ static void update_gps_entry(int lat, int lon) } } -#if HAVE_OSM_GPS_MAP static void update_gps_entry_callback(float lat, float lon) { update_gps_entry(lat * 1000000, lon * 1000000); @@ -420,7 +419,6 @@ static gboolean gps_map_callback(GtkWidget *w, gpointer data) show_gps_location(&fake_dive, update_gps_entry_callback); return TRUE; } -#endif /* * If somebody sets the string by editing the text entry, @@ -524,9 +522,7 @@ void divetag_toggle_cb(GtkWidget *widget, gpointer data) static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_info *info, int multi, int *show_tags) { GtkWidget *hbox, *frame, *equipment, *ibox, *box, *button, *sbox, *framebox; -#if HAVE_OSM_GPS_MAP GtkWidget *image; -#endif char buffer[256]; char airtemp[10]; const char *unit; @@ -566,7 +562,6 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf gtk_widget_add_events(GTK_WIDGET(info->gps), GDK_FOCUS_CHANGE_MASK); g_signal_connect(G_OBJECT(info->gps), "focus-out-event", G_CALLBACK(gps_entry_change_cb), NULL); gtk_entry_set_width_chars(info->gps, 30); -#if HAVE_OSM_GPS_MAP info->gps_icon = gtk_button_new_with_label(_("Pick on map")); gtk_box_pack_start(GTK_BOX(hbox), info->gps_icon, FALSE, FALSE, 6); image = gtk_image_new_from_pixbuf(get_gps_icon()); @@ -574,7 +569,6 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf gtk_button_set_image(GTK_BUTTON(info->gps_icon), image); g_signal_connect(G_OBJECT(info->gps_icon), "clicked", G_CALLBACK(gps_map_callback), NULL); -#endif hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0); |