Merge pull request #3187 from Diapolo/netManager

[Qt] paymentserver: start netManager in uiReady()
This commit is contained in:
Wladimir J. van der Laan 2013-11-11 07:00:34 -08:00
commit a6aa179699
4 changed files with 4 additions and 6 deletions

View File

@ -308,7 +308,6 @@ int main(int argc, char *argv[])
PaymentServer::LoadRootCAs();
paymentServer->setOptionsModel(&optionsModel);
paymentServer->initNetManager();
if (splashref)
splash.finish(&window);

View File

@ -341,7 +341,7 @@ void PaymentServer::initNetManager()
void PaymentServer::uiReady()
{
assert(netManager != NULL); // Must call initNetManager before uiReady()
initNetManager();
saveURIs = false;
foreach (const QString& s, savedPaymentRequests)

View File

@ -77,9 +77,6 @@ public:
// Return certificate store
static X509_STORE* getCertStore() { return certStore; }
// Setup networking
void initNetManager();
// Constructor registers this on the parent QApplication to
// receive QEvent::FileOpen events
bool eventFilter(QObject *object, QEvent *event);
@ -119,6 +116,9 @@ private:
bool processPaymentRequest(PaymentRequestPlus& request, SendCoinsRecipient& recipient);
void fetchRequest(const QUrl& url);
// Setup networking
void initNetManager();
bool saveURIs; // true during startup
QLocalServer* uriServer;

View File

@ -60,7 +60,6 @@ void PaymentServerTests::paymentServerTests()
X509_STORE_add_cert(caStore, parse_b64der_cert(caCert_BASE64));
PaymentServer::LoadRootCAs(caStore);
server->setOptionsModel(&optionsModel);
server->initNetManager();
server->uiReady();
// Now feed PaymentRequests to server, and observe signals it produces: