Put client version data into coinbase flags.

diff --git a/src/init.cpp b/src/init.cpp
index 2437e3b..7cc0e0f 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -489,12 +489,8 @@ bool AppInit2()
             nConnectTimeout = nNewTimeout;
     }
 
-    // Continue to put "/P2SH/" in the coinbase to monitor
-    // BIP16 support.
-    // This can be removed eventually...
-    const char* pszP2SH = "/P2SH/";
-    COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
-
+    // Put client version data into coinbase flags.
+    COINBASE_FLAGS << PROTOCOL_VERSION << DISPLAY_VERSION_MAJOR << DISPLAY_VERSION_MINOR << DISPLAY_VERSION_REVISION;
 
     if (mapArgs.count("-paytxfee"))
     {

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index d8fe02e..ff773f6 100644 (file)
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -270,7 +270,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         connect(model, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
         connect(model, SIGNAL(numBlocksChanged(int,int)), this, SLOT(setNumBlocks(int,int)));
 
-       updateTrafficStats(model->getTotalBytesRecv(), model->getTotalBytesSent());
+        updateTrafficStats(model->getTotalBytesRecv(), model->getTotalBytesSent());
         connect(model, SIGNAL(bytesChanged(quint64,quint64)), this, SLOT(updateTrafficStats(quint64, quint64)));
         // Provide initial values
         ui->clientVersion->setText(model->formatFullVersion());

diff --git a/src/version.cpp b/src/version.cpp
index b43ca64..8e74499 100644 (file)
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -33,7 +33,7 @@ const std::string CLIENT_NAME("Satoshi");
 #define CL_NAME   "-mingw"
 #else
 #define CL_NAME   "-genericcl"
-/*overs*/
+/*others*/
 #endif
 
 // The following part of the code determines the CLIENT_BUILD variable.