aboutsummaryrefslogtreecommitdiff
path: root/ui.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-10 23:10:30 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-10 23:10:30 +0000
commitf93d5f9ffe1e12079e560a735111735924726a06 (patch)
tree0a34330f01acf1a2cd18f5a9f8c36ec29216a3e8 /ui.cpp
parent2ca17588327858947590fda78d68cfad79e633bc (diff)
downloadbitcoin-f93d5f9ffe1e12079e560a735111735924726a06.tar.xz
automatically change displayed address whenever it receives anything,v0.2.10
added help and -? for daemon command line rpc commands, only relay addr messages to 5 random nodes to save bandwidth, started setting wtx.fFromMe flag, trickle out tx inventory messages to protect privacy -- version 0.2.10 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@81 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'ui.cpp')
-rw-r--r--ui.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui.cpp b/ui.cpp
index e86456a021..a21cd436c4 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -1016,6 +1016,11 @@ void CMainFrame::OnPaintListCtrl(wxPaintEvent& event)
if (fDebug && GetTime() - nThreadSocketHandlerHeartbeat > 60)
m_statusBar->SetStatusText(" ERROR: ThreadSocketHandler has stopped", 0);
+
+ // Update receiving address
+ string strDefaultAddress = PubKeyToAddress(vchDefaultKey);
+ if (m_textCtrlAddress->GetValue() != strDefaultAddress)
+ m_textCtrlAddress->SetValue(strDefaultAddress);
}
@@ -2087,7 +2092,9 @@ void CSendingDialog::OnReply2(CDataStream& vRecv)
}
// Send payment tx to seller, with response going to OnReply3 via event handler
- pnode->PushRequest("submitorder", wtx, SendingDialogOnReply3, this);
+ CWalletTx wtxSend = wtx;
+ wtxSend.fFromMe = false;
+ pnode->PushRequest("submitorder", wtxSend, SendingDialogOnReply3, this);
Status(_("Waiting for confirmation..."));
MainFrameRepaint();