closes #12

swisssurfer/src/browser.hxx

@@ -22,23 +22,34 @@
 
 #include <proxyface/proxy.hxx>
 
+#include <smartcardauth.hxx>
+
 #include <stdexcept>
 #include <cassert>
 #include <QtCore/QDebug>
 
 #define LOG qDebug()<<__PRETTY_FUNCTION__
 
+extern SmartCardAuth _scAuth;
+
 class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
     Q_OBJECT;
   public:
+    
     SslClientAuthNetworkAccessManager(QObject* parent = 0):
         QNetworkAccessManager(parent) {
       LOG;
+      assert
+        (connect(this, SIGNAL(extendedContextInitialization(ssl_ctx_st*)),
+                 &_scAuth, SLOT(extendedContextInitialization(ssl_ctx_st*))));
     }
+    
     virtual ~SslClientAuthNetworkAccessManager() {
       LOG;
     }
+    
   protected:
+    
     virtual QNetworkReply* createRequest(Operation op,
                                          const QNetworkRequest& req,
                                          QIODevice* outgoingData = 0 ) {
@@ -49,6 +60,7 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
       qDebug()<<"Reply to URL: "<<rep->url().toString();
       return rep;
     }
+
 };
 
 class Browser: public QMainWindow, protected Ui::Browser {
@@ -57,7 +69,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
   public:
 
-    Browser(const QString& url, bool kiosk = false, bool proxydetection = true):
+    Browser(const QString& url, bool kiosk = false, bool proxydetection = false):
         _url(0), _home(url), _proxy(0),
         _kiosk(kiosk) {
       LOG<<url;
@@ -576,7 +588,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
     void on_actionNew_triggered() {
       LOG;
-      (new Browser(_browser->url().toString(), _kiosk))->show();
+      (new Browser(_browser->url().toString(), _kiosk, false))->show();
     }
 
     void on_actionClose_triggered() {
@@ -865,7 +877,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
     
     void repaintRequested(const QRect& dirtyRect) {
-      LOG;
+      //LOG;
     }
     
     void restoreFrameStateRequested(QWebFrame* frame) {