support of the new managers in account code, new states, new lambdas, even launches now, even receives some bundles

core/account.h

@@ -42,6 +42,7 @@
 #include <QXmppUploadRequestManager.h>
 #include <QXmppVCardManager.h>
 #include <QXmppMessageReceiptManager.h>
+#include <QXmppPubSubManager.h>
 
 #include <shared/shared.h>
 #include <shared/identity.h>
@@ -195,6 +196,7 @@ private:
     QXmppUploadRequestManager* um;
     QXmppDiscoveryManager* dm;
     QXmppMessageReceiptManager* rcpm;
+    QXmppPubSubManager* psm;
     bool reconnectScheduled;
     QTimer* reconnectTimer;
     
@@ -204,6 +206,7 @@ private:
     Shared::Support pepSupport;
     bool active;
     bool notReadyPassword;
+    bool loadingOmemo;
     
 private slots:
     void onClientStateChange(QXmppClient::State state);
@@ -223,6 +226,7 @@ private:
     void handleDisconnection();
     void onReconnectTimer();
     void setPepSupport(Shared::Support support);
+    void runDiscoveryService();
 };
 }