[vidalia-svn] r4003: Fixed pki loading to use fromPath. Resource loading still no (vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-03 22:58:41 -0400 (Mon, 03 Aug 2009)
New Revision: 4003

Modified:
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
Log:
Fixed pki loading to use fromPath. Resource loading still not working?

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 02:39:14 UTC (rev 4002)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 02:58:41 UTC (rev 4003)
@@ -376,15 +376,11 @@
   _sslConfig = new QSslConfiguration(QSslConfiguration::defaultConfiguration());
 
   /* Make a list of ceritificates which only uses HerdictWeb's CA */
-  QList<QSslCertificate> caCertificates;
-  QFile* caFile = new QFile(":herdict/pki/EquifaxSecureCA.crt");
-  QSslCertificate ca(caFile);
-  caCertificates.append(ca);
+  QList<QSslCertificate> caCertificates = 
+    QSslCertificate::fromPath(":/herdict/pki");;
 
   /* Set the configuration to use the CA list */
   _sslConfig->setCaCertificates(caCertificates);
-
-  delete caFile;
 }
 
 void

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc	2009-08-04 02:39:14 UTC (rev 4002)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc	2009-08-04 02:58:41 UTC (rev 4003)
@@ -1,11 +1,11 @@
 <RCC>
-    <qresource prefix="herdict/images">
+    <qresource prefix="/herdict/images">
         <file>herdict-button-accessible.gif</file>
         <file>herdict-button-inaccessible.gif</file>
         <file>herdict-header-background.gif</file>
         <file>herdict-logo.gif</file>
     </qresource>
-    <qresource prefix="herdict/pki">
+    <qresource prefix="/herdict/pki">
         <file>EquifaxSecureCA.crt</file>
     </qresource>
 </RCC>
\ No newline at end of file