mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable https on Windows for 4.0

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-12-15 14:24:30 -08:00
parent d3065d811a
commit 5c2ded5840
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/windows/subsurface.nsi.in
View file

@ -118,6 +118,7 @@ Section
File libgcc_s_sjlj-1.dll
File libstdc++-6.dll
File libmarblewidget*dll
File libssl-10.dll
File Qt*4.dll
File subsurface.ico
File qt.conf

12
qt-ui/subsurfacewebservices.cpp
View file

@ -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