[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/management
From:       Laurent Montel <montel () kde ! org>
Date:       2007-09-02 13:33:19
Message-ID: 1188739999.682437.31508.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707628 by mlaurent:

Fix qsslsocket signal/slot
Display error from ssl


 M  +9 -4      networkscanner.cpp  
 M  +2 -1      networkscanner.h  


--- trunk/KDE/kdelibs/kdeprint/management/networkscanner.cpp #707627:707628
@@ -30,6 +30,7 @@
 #include <QtCore/QRegExp>
 #include <QtNetwork/QTcpSocket>
 #include <QtNetwork/QHostInfo>
+#include <QSslError>
 
 #include <kpushbutton.h>
 #include <klocale.h>
@@ -195,8 +196,8 @@
 
 	connect( d->socket, SIGNAL(connected()),
                  SLOT(slotConnectionSuccess()) );
-	connect( d->socket, SIGNAL(error()),
-                 SLOT(slotConnectionFailed()) );
+	connect( d->socket, SIGNAL(sslErrors ( const QList<QSslError> &)),
+                 SLOT(slotConnectionFailed(const QList<QSslError> &)) );
 }
 
 void NetworkScanner::next()
@@ -243,9 +244,13 @@
 	next();
 }
 
-void NetworkScanner::slotConnectionFailed()
+void NetworkScanner::slotConnectionFailed(const QList<QSslError> &lst)
 {
-	kDebug() << "Failure";
+        QListIterator<QSslError> it( lst );
+        while ( it.hasNext() )
+        {
+	  kDebug() << "Failure : "<<it.next().errorString ();
+        }
 	next();
 }
 
--- trunk/KDE/kdelibs/kdeprint/management/networkscanner.h #707627:707628
@@ -26,6 +26,7 @@
 #include <QtCore/QList>
 #include <QtGui/QWidget>
 #include <QtNetwork/QAbstractSocket>
+class QSslError;
 
 class KDEPRINT_MANAGEMENT_EXPORT NetworkScanner : public QWidget
 {
@@ -58,7 +59,7 @@
 
 protected Q_SLOTS:
 	void slotConnectionSuccess();
-	void slotConnectionFailed();
+	void slotConnectionFailed(const QList<QSslError>&);
 	void slotTimeout();
 	void slotScanClicked();
 	void slotSettingsClicked();
[prev in list] [next in list] [prev in thread] [next in thread]