addr relaying fixes, proxy option and privacy patches, detect connect to self, non-final tx locktime changes, fix hide unconfirmed generated

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@18 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 6 insertions, 2 deletions

diff --git a/ui.h b/ui.h
index f451d93565..9fc7e0ebe7 100644
--- a/ui.h
+++ b/ui.h
@@ -89,7 +89,7 @@ public:
     void OnCrossThreadCall(wxCommandEvent& event);

     void InsertLine(bool fNew, int nIndex, uint256 hashKey, string strSort, const wxString& str1, const wxString& str2, const wxString& str3, const wxString& str4, const wxString& str5);

     bool DeleteLine(uint256 hashKey);

-    void InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex=-1);

+    bool InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex=-1);

     void RefreshListCtrl();

     void RefreshStatus();

 };

@@ -121,6 +121,9 @@ protected:
     void OnKillFocusTransactionFee(wxFocusEvent& event);

     void OnCheckBoxLimitProcessors(wxCommandEvent& event);

     void OnCheckBoxMinimizeToTray(wxCommandEvent& event);

+    void OnCheckBoxUseProxy(wxCommandEvent& event);

+    void OnKillFocusProxy(wxFocusEvent& event);

+

     void OnButtonOK(wxCommandEvent& event);

     void OnButtonCancel(wxCommandEvent& event);

     void OnButtonApply(wxCommandEvent& event);

@@ -133,6 +136,7 @@ public:
     bool fTmpStartOnSystemStartup;

     bool fTmpMinimizeOnClose;

     void SelectPage(int nPage);

+    CAddress GetProxyAddr();

 };

 

 

@@ -193,7 +197,7 @@ public:
     int64 nPrice;

     CWalletTx wtx;

     wxDateTime start;

-    string strStatus;

+    char pszStatus[10000];

     bool fCanCancel;

     bool fAbort;

     bool fSuccess;