maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #491 from rnicoll/1.7-dev-no-payment

Browse source 
Disable payment protocol pending further assessment and potential rework
This commit is contained in:
langerhans 2014-04-28 19:42:03 +02:00
parent 657a287ddb 725860440c
commit d2b27b562e
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/qt/bitcoin.cpp
View file

@ -170,7 +170,7 @@ public:
#ifdef ENABLE_WALLET
/// Create payment server
void createPaymentServer();
// void createPaymentServer();
#endif
/// Create options model
void createOptionsModel();
@ -206,7 +206,7 @@ private:
BitcoinGUI *window;
QTimer *pollShutdownTimer;
#ifdef ENABLE_WALLET
PaymentServer* paymentServer;
// PaymentServer* paymentServer;
WalletModel *walletModel;
#endif
int returnValue;
@ -273,7 +273,7 @@ BitcoinApplication::BitcoinApplication(int &argc, char **argv):
window(0),
pollShutdownTimer(0),
#ifdef ENABLE_WALLET
paymentServer(0),
// paymentServer(0),
walletModel(0),
#endif
returnValue(0)
@ -292,18 +292,20 @@ BitcoinApplication::~BitcoinApplication()
delete window;
window = 0;
#ifdef ENABLE_WALLET
delete paymentServer;
paymentServer = 0;
// delete paymentServer;
// paymentServer = 0;
#endif
delete optionsModel;
optionsModel = 0;
}
#ifdef ENABLE_WALLET
/*
void BitcoinApplication::createPaymentServer()
{
paymentServer = new PaymentServer(this);
}
*/
#endif
void BitcoinApplication::createOptionsModel()
@ -386,10 +388,12 @@ void BitcoinApplication::initializeResult(int retval)
returnValue = retval ? 0 : 1;
if(retval)
{
/*
#ifdef ENABLE_WALLET
PaymentServer::LoadRootCAs();
paymentServer->setOptionsModel(optionsModel);
#endif
*/
emit splashFinished(window);
@ -404,8 +408,10 @@ void BitcoinApplication::initializeResult(int retval)
window->addWallet("~Default", walletModel);
window->setCurrentWallet("~Default");
/*
connect(walletModel, SIGNAL(coinsSent(CWallet*,SendCoinsRecipient,QByteArray)),
paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray)));
*/
}
#endif
@ -419,8 +425,11 @@ void BitcoinApplication::initializeResult(int retval)
window->show();
}
#ifdef ENABLE_WALLET
// Payment server disabled pending future work on specifications
// Now that initialization/startup is done, process any command-line
// dogecoin: URIs or payment requests:
/*
connect(paymentServer, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)),
window, SLOT(handlePaymentRequest(SendCoinsRecipient)));
connect(window, SIGNAL(receivedURI(QString)),
@ -428,6 +437,7 @@ void BitcoinApplication::initializeResult(int retval)
connect(paymentServer, SIGNAL(message(QString,QString,unsigned int)),
window, SLOT(message(QString,QString,unsigned int)));
QTimer::singleShot(100, paymentServer, SLOT(uiReady()));
*/
#endif
} else {
quit(); // Exit main loop
@ -548,7 +558,7 @@ int main(int argc, char *argv[])
// Start up the payment server early, too, so impatient users that click on
// dogecoin: links repeatedly have their payment requests routed to this process:
app.createPaymentServer();
// app.createPaymentServer();
#endif
/// 9. Main GUI initialization