From 83a313f1ee1f09eab9571f978d84a8b55e9471e0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 9 Apr 2013 16:01:17 -0700 Subject: Correctly conditionalize compilation for menu structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only call upload_all_dives_divelogs_cb() if we have both libzip and xslt. Reported-by: Jozef Ivanecký (dodo.sk@gmail.com) Signed-off-by: Dirk Hohndel --- gtk-gui.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gtk-gui.c') diff --git a/gtk-gui.c b/gtk-gui.c index 755c8e1ef..eb07807b0 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -1572,7 +1572,9 @@ static GtkActionEntry menu_items[] = { { "Print", GTK_STOCK_PRINT, N_("Print..."), CTRLCHAR "P", NULL, G_CALLBACK(do_print) }, { "ImportFile", NULL, N_("Import File(s)..."), CTRLCHAR "I", NULL, G_CALLBACK(import_files) }, { "ExportUDDF", NULL, N_("Export UDDF..."), NULL, NULL, G_CALLBACK(export_all_dives_uddf_cb) }, +#if defined(LIBZIP) && defined(XSLT) { "UploadDivelogs", NULL, N_("Upload to divelogs.de..."), NULL, NULL, G_CALLBACK(upload_all_dives_divelogs_cb) }, +#endif { "DownloadLog", NULL, N_("Download From Dive Computer..."), CTRLCHAR "D", NULL, G_CALLBACK(download_dialog) }, { "DownloadWeb", GTK_STOCK_CONNECT, N_("Download From Web Service..."), NULL, NULL, G_CALLBACK(webservice_download_dialog) }, { "AddDive", GTK_STOCK_ADD, N_("Add Dive..."), NULL, NULL, G_CALLBACK(add_dive_cb) }, @@ -1614,9 +1616,11 @@ static const gchar* ui_string = " \ \ \ \ - \ - \ - \ + " +#if defined(LIBZIP) && defined(XSLT) + "" +#endif + " \ \ \ \ -- cgit v1.2.3-70-g09d2