diff -r 52e8c820d0dd -r c679fb30c8f3 Helpviewer/Network/NetworkAccessManager.py
--- a/Helpviewer/Network/NetworkAccessManager.py Mon Dec 28 18:31:37 2009 +0000
+++ b/Helpviewer/Network/NetworkAccessManager.py Wed Dec 30 15:40:33 2009 +0000
@@ -66,7 +66,7 @@
sslCfg = QSslConfiguration.defaultConfiguration()
caList = sslCfg.caCertificates()
caNew = QSslCertificate.fromData(Preferences.Prefs.settings\
- .value("Help/CaCertificates").toByteArray())
+ .value("Help/CaCertificates"))
for cert in caNew:
caList.append(cert)
sslCfg.setCaCertificates(caList)
@@ -238,7 +238,7 @@
@param errors list of SSL errors (list of QSslError)
"""
caMerge = QSslCertificate.fromData(Preferences.Prefs.settings\
- .value("Help/CaCertificates").toByteArray())
+ .value("Help/CaCertificates"))
caNew = []
errorStrings = []
@@ -293,8 +293,7 @@
pems = QByteArray()
for cert in caMerge:
pems.append(cert.toPem() + '\n')
- Preferences.Prefs.settings.setValue("Help/CaCertificates",
- QVariant(pems))
+ Preferences.Prefs.settings.setValue("Help/CaCertificates", pems)
reply.ignoreSslErrors()
@@ -337,10 +336,9 @@
"""
Public slot to (re-)load the list of accepted languages.
"""
- languages = Preferences.Prefs.settings.value(
+ languages = Preferences.Prefs.settings.value(Preferences.toList(
"Help/AcceptLanguages",
- QVariant(HelpLanguagesDialog.defaultAcceptLanguages()))\
- .toStringList()
+ HelpLanguagesDialog.defaultAcceptLanguages()))
self.__acceptLanguage = HelpLanguagesDialog.httpString(languages)
def __setDiskCache(self):
