[vidalia-svn] r4001: Temporarily added output of SSL errors to debug. Temporarily (in vidalia/branches/extension-api/src: plugins/HerdictWebReporterPlugin vidalia)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-03 22:12:11 -0400 (Mon, 03 Aug 2009)
New Revision: 4001

Modified:
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
   vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/main.cpp
Log:
Temporarily added output of SSL errors to debug. Temporarily importing herdictweb as a static plugin again. SSL 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 01:26:05 UTC (rev 4000)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 02:12:11 UTC (rev 4001)
@@ -60,6 +60,10 @@
   connect(_torAccessManager, SIGNAL(finished(QNetworkReply*)),
           this, SLOT(requestFinished(QNetworkReply*)));
 
+  /* TODO: Temporary thingy */
+  connect(_accessManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+          this, SLOT(sslError(QNetworkReply*,QList<QSslError>)));
+
   /* Make the web views use their respective network access manager */
   ui.webViewPlain->page()->setNetworkAccessManager(_accessManager);
   ui.webViewTor->page()->setNetworkAccessManager(_torAccessManager);
@@ -101,6 +105,14 @@
           ui.progressTor, SLOT(setValue(int)));
 }
 
+void
+HerdictWebReporterPanel::sslError(QNetworkReply* reply, const QList<QSslError>& errors)
+{
+  foreach(QSslError error, errors) {
+    qDebug() << "SSL Error: " <<  error.errorString() << endl;
+  }
+}
+
 HerdictWebReporterPanel::~HerdictWebReporterPanel()
 {
   delete _accessManager;
@@ -381,7 +393,8 @@
   /* *** TODO: Make all requests use SSL ***  */
 
   /* Create each network request */
-  QNetworkRequest categoriesRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-categories/Vidalia1.0";));
+  QNetworkRequest categoriesRequest(QUrl("https://www.herdict.org/web/action/ajax/plugin/init-categories/Vidalia1.0";));
+  categoriesRequest.setSslConfiguration(*_sslConfig);
   QNetworkRequest countriesRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-countries/Vidalia1.0";));
   QNetworkRequest locationsRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-locations/Vidalia1.0";));
   QNetworkRequest interestsRequest(QUrl("http://www.herdict.org/web/action/ajax/plugin/init-interests/Vidalia1.0";));

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h	2009-08-04 01:26:05 UTC (rev 4000)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.h	2009-08-04 02:12:11 UTC (rev 4001)
@@ -43,6 +43,7 @@
   QWidget* statusWidget() const;
 
 private slots:
+  void sslError(QNetworkReply* reply, const QList<QSslError>& errors);
   /* Change the status bar message */
   void changeStatusMessage(const QString& message);
   /* Handle webViewPlain finishing */

Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-08-04 01:26:05 UTC (rev 4000)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-08-04 02:12:11 UTC (rev 4001)
@@ -392,6 +392,7 @@
   dashboardplugin
   messagelogplugin
   networkmapplugin
+  herdictwebreporterplugin
 )
 if (USE_MINIUPNPC)
   target_link_libraries(${vidalia_BIN} miniupnpc)

Modified: vidalia/branches/extension-api/src/vidalia/main.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/main.cpp	2009-08-04 01:26:05 UTC (rev 4000)
+++ vidalia/branches/extension-api/src/vidalia/main.cpp	2009-08-04 02:12:11 UTC (rev 4001)
@@ -34,9 +34,9 @@
 
 
 Q_IMPORT_PLUGIN(homeplugin)
-Q_IMPORT_PLUGIN(dashboardplugin)
 Q_IMPORT_PLUGIN(networkmapplugin)
 Q_IMPORT_PLUGIN(messagelogplugin)
+Q_IMPORT_PLUGIN(herdictwebreporterplugin)
 
 extern "C" void
 signal_handler(int signal)