From eada87b438464561a451f298a2c0cadcdac67c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 27 Apr 2011 12:07:14 +0000 Subject: [PATCH] more debug on ssl error; refs #22 --- swisssurfer/src/browser.hxx | 2 +- swisssurfer/src/downloadmanager.hxx | 4 ++-- swisssurfer/src/swisssurfer_de.ts | 19 ++++++++++++------- swisssurfer/src/swisssurfer_en.ts | 19 ++++++++++++------- swisssurfer/src/swisssurfer_fr.ts | 19 ++++++++++++------- swisssurfer/src/swisssurfer_it.ts | 19 ++++++++++++------- 6 files changed, 51 insertions(+), 31 deletions(-) diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index e32687f..b4a8a00 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -1117,7 +1117,7 @@ class Browser: public QMainWindow, protected Ui::Browser { <<"L="<certificate().subjectInfo(QSslCertificate::LocalityName) <<"OU="<certificate().subjectInfo(QSslCertificate::OrganizationalUnitName) <<"C="<certificate().subjectInfo(QSslCertificate::CountryName) - <<"ST="<certificate().subjectInfo(QSslCertificate::StateOrProvince); + <<"ST="<certificate().subjectInfo(QSslCertificate::StateOrProvinceName); } // e+=tr("
  • %1
  • ", "single ssl error").arg(err->errorString()); // _error[sender()] += tr("

    %1

    URL: %4

    %2

    " diff --git a/swisssurfer/src/downloadmanager.hxx b/swisssurfer/src/downloadmanager.hxx index 4786ca6..4585e75 100644 --- a/swisssurfer/src/downloadmanager.hxx +++ b/swisssurfer/src/downloadmanager.hxx @@ -179,10 +179,10 @@ class DownloadManager: public QObject { <<"L="<certificate().subjectInfo(QSslCertificate::LocalityName) <<"OU="<certificate().subjectInfo(QSslCertificate::OrganizationalUnitName) <<"C="<certificate().subjectInfo(QSslCertificate::CountryName) - <<"ST="<certificate().subjectInfo(QSslCertificate::StateOrProvince); + <<"ST="<certificate().subjectInfo(QSslCertificate::StateOrProvinceName); } } - } + void uploadProgress(qint64 bytesSent, qint64 bytesTotal) { //LOG<(sender())].first = bytesSent; diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index 46706da..2950ba8 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -308,11 +308,16 @@ - Certificate Assistant %1 (%2) + SwissSurfer %1 (%2) %3 Using: qt-%4 Compiled: qt-%5 + Certificate Assistant %1 (%2) + +%3 +Using: qt-%4 +Compiled: qt-%5 @@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -574,27 +579,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 46706da..2950ba8 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -308,11 +308,16 @@ - Certificate Assistant %1 (%2) + SwissSurfer %1 (%2) %3 Using: qt-%4 Compiled: qt-%5 + Certificate Assistant %1 (%2) + +%3 +Using: qt-%4 +Compiled: qt-%5 @@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -574,27 +579,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 46706da..2950ba8 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -308,11 +308,16 @@ - Certificate Assistant %1 (%2) + SwissSurfer %1 (%2) %3 Using: qt-%4 Compiled: qt-%5 + Certificate Assistant %1 (%2) + +%3 +Using: qt-%4 +Compiled: qt-%5 @@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -574,27 +579,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 46706da..2950ba8 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -308,11 +308,16 @@ - Certificate Assistant %1 (%2) + SwissSurfer %1 (%2) %3 Using: qt-%4 Compiled: qt-%5 + Certificate Assistant %1 (%2) + +%3 +Using: qt-%4 +Compiled: qt-%5 @@ -549,7 +554,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -574,27 +579,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help