From 5c2ded584085f79d39e40ad89fd0c52980bab676 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 15 Dec 2013 14:24:30 -0800 Subject: Disable https on Windows for 4.0 We appear to be missing the correct dll. I'm out of time trying to track this down, so I just switched Subsurface to access divelogs.de via http on Windwos. Signed-off-by: Dirk Hohndel --- qt-ui/subsurfacewebservices.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index 150889135..096100ad8 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -623,7 +623,11 @@ void DivelogsDeWebServices::startUpload() ui.password->setEnabled(false); QNetworkRequest request; +#ifdef WIN32 + request.setUrl(QUrl("http://divelogs.de/DivelogsDirectImport.php")); +#else request.setUrl(QUrl("https://divelogs.de/DivelogsDirectImport.php")); +#endif request.setRawHeader("Accept", "text/xml, application/xml"); QHttpPart part; @@ -654,7 +658,11 @@ void DivelogsDeWebServices::startDownload() ui.password->setEnabled(false); QNetworkRequest request; +#ifdef WIN32 + request.setUrl(QUrl("http://divelogs.de/xml_available_dives.php")); +#else request.setUrl(QUrl("https://divelogs.de/xml_available_dives.php")); +#endif request.setRawHeader("Accept", "text/xml, application/xml"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); @@ -766,9 +774,9 @@ void DivelogsDeWebServices::downloadFinished() quint64 entries; #if defined(LIBZIP_VERSION_MAJOR) - entries = zip_get_num_entries(zip, 0); + entries = zip_get_num_entries(zip, 0); #else - // old version of libzip + // old version of libzip entries = zip_get_num_files(zip); #endif -- cgit v1.2.3-70-g09d2