X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.h;h=7ff5399b16d5763b71d863aee051ad7ca433cbec;hp=e8cee5ab599afaf3a85390de773d62ddb1fa3fc8;hb=4aed4b037ea6feaeec09743e5d6018f58d47a535;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/client/clientsyncer.h b/src/client/clientsyncer.h
index e8cee5ab..7ff5399b 100644
--- a/src/client/clientsyncer.h
+++ b/src/client/clientsyncer.h
@@ -44,9 +44,12 @@ public:
   ClientSyncer(QObject *parent = 0);
   ~ClientSyncer();
 
+  inline const QIODevice *currentDevice() { return socket; }
+
 signals:
   void recvPartialItem(quint32 avail, quint32 size);
   void connectionError(const QString &errorMsg);
+  void connectionWarnings(const QStringList &warnings);
   void connectionMsg(const QString &msg);
   void sessionProgress(quint32 part, quint32 total);
   void networksProgress(quint32 part, quint32 total);
@@ -61,17 +64,21 @@ signals:
   void coreSetupSuccess();
   void coreSetupFailed(const QString &error);
 
-  void encrypted(bool);
+  void encrypted(); // relaying encrypted signal of the encapsulated SslSocket
 
   void startInternalCore(ClientSyncer *syncer);
   void connectToInternalCore(SignalProxy *proxy);
 
+  void handleIgnoreWarnings(bool permanently);
+
 public slots:
   void connectToCore(const QVariantMap &);
   void loginToCore(const QString &user, const QString &passwd);
   void disconnectFromCore();
   void useInternalCore();
 
+  inline void ignoreWarnings(bool permanently) { emit handleIgnoreWarnings(permanently); }
+
 private slots:
   void coreSocketError(QAbstractSocket::SocketError);
   void coreHasData();
@@ -88,15 +95,23 @@ private slots:
   void internalSessionStateReceived(const QVariant &packedState);
   void sessionStateReceived(const QVariantMap &state);
 
+  void connectionReady();
   void doCoreSetup(const QVariant &setupData);
+
+  void setWarningsHandler(const char *slot);
+  void resetWarningsHandler();
+
 #ifdef HAVE_SSL
-    void sslErrors(const QList<QSslError> &errors);
+  void ignoreSslWarnings(bool permanently);
+  void sslSocketEncrypted();
+  void sslErrors(const QList<QSslError> &errors);
 #endif
 
 private:
   QPointer<QIODevice> socket;
   quint32 blockSize;
   QVariantMap coreConnectionInfo;
+  QVariantMap _coreMsgBuffer;
 
   QSet<QObject *> netsToSync;
   int numNetsToSync;