From 01cd2fdaf3ac6071304ceb80fb7436ac02b1059e Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Thu, 12 Aug 2010 21:13:43 +0000
Subject: [PATCH] fix -datadir=./subdir relative path, autostart off by default
 except on windows, fix occasional "vector iterator not dereferencable"
 assertion with msvc, fix readlink compile warning on linux build, use
 sys/param.h and BSD define instead of __BSD__, -paytxfee switch

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@130 1a98c847-1fd6-4fd8-948a-caf3550aa51b
---
 headers.h                        |  16 +++++++++-------
 init.cpp                         |  16 ++++++++++++++--
 locale/de/LC_MESSAGES/bitcoin.mo | Bin 16083 -> 16116 bytes
 locale/de/LC_MESSAGES/bitcoin.po |  12 ++++++++++--
 locale/es/LC_MESSAGES/bitcoin.mo | Bin 14996 -> 15040 bytes
 locale/es/LC_MESSAGES/bitcoin.po |  12 ++++++++++--
 locale/fr/LC_MESSAGES/bitcoin.mo | Bin 15723 -> 15771 bytes
 locale/fr/LC_MESSAGES/bitcoin.po |  12 ++++++++++--
 locale/it/LC_MESSAGES/bitcoin.mo | Bin 15607 -> 15643 bytes
 locale/it/LC_MESSAGES/bitcoin.po |  12 ++++++++++--
 locale/nl/LC_MESSAGES/bitcoin.mo | Bin 14914 -> 14946 bytes
 locale/nl/LC_MESSAGES/bitcoin.po |  12 ++++++++++--
 locale/pt/LC_MESSAGES/bitcoin.mo | Bin 15654 -> 15684 bytes
 locale/pt/LC_MESSAGES/bitcoin.po |  12 ++++++++++--
 main.cpp                         |   2 +-
 net.cpp                          |  30 ++++++++++++++++++++++++++++--
 rpc.cpp                          |   4 ++--
 serialize.h                      |   2 +-
 ui.cpp                           |  14 ++++++++------
 util.h                           |  15 +++++++++------
 20 files changed, 132 insertions(+), 39 deletions(-)

diff --git a/headers.h b/headers.h
index a0b4c5edcf8..5c9e6e324a6 100644
--- a/headers.h
+++ b/headers.h
@@ -18,6 +18,14 @@
 #define _WIN32_IE 0x0400
 #define WIN32_LEAN_AND_MEAN 1
 #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>  // to get BSD define
+#endif
+#ifdef __WXMAC_OSX__
+#ifndef BSD
+#define BSD 1
+#endif
+#endif
 #ifdef GUI
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
@@ -25,12 +33,6 @@
 #include <wx/utils.h>
 #include <wx/clipbrd.h>
 #include <wx/taskbar.h>
-#else
-#ifdef __WXMAC_OSX__
-#define __WXMAC__ 1
-#define __WXOSX__ 1
-#define __BSD__ 1
-#endif
 #endif
 #include <openssl/buffer.h>
 #include <openssl/ecdsa.h>
@@ -98,7 +100,7 @@
 #include <ifaddrs.h>
 #include <fcntl.h>
 #endif
-#ifdef __BSD__
+#ifdef BSD
 #include <netinet/in.h>
 #endif
 
diff --git a/init.cpp b/init.cpp
index 0eacebc3054..b99237ec669 100644
--- a/init.cpp
+++ b/init.cpp
@@ -137,7 +137,10 @@ bool AppInit2(int argc, char* argv[])
     ParseParameters(argc, argv);
 
     if (mapArgs.count("-datadir"))
-        strlcpy(pszSetDataDir, mapArgs["-datadir"].c_str(), sizeof(pszSetDataDir));
+    {
+        filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]);
+        strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
+    }
 
     ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir
 
@@ -363,6 +366,15 @@ bool AppInit2(int argc, char* argv[])
         }
     }
 
+    if (mapArgs.count("-paytxfee"))
+    {
+        if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))
+        {
+            wxMessageBox(_("Invalid amount for -paytxfee=<amount>"), "Bitcoin");
+            return false;
+        }
+    }
+
     //
     // Create the main window and start the node
     //
@@ -382,7 +394,7 @@ bool AppInit2(int argc, char* argv[])
     if (mapArgs.count("-server") || fDaemon)
         CreateThread(ThreadRPCServer, NULL);
 
-#ifdef GUI
+#if defined(__WXMSW__) && defined(GUI)
     if (fFirstRun)
         SetStartOnSystemStartup(true);
 #endif
diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo
index 2b5ff6f963d91d67e7f86ea7cbbdb04e9e29e510..5d7eeb2b873101f76bcf96a195d47dd6ce5e7758 100644
GIT binary patch
delta 3392
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
EzoFW95&!@I

delta 3370
zcmXxk32;qU9LMqVNJ5gAO(d~|Jc%VCMQRNZ(y<KM(Ar~Cf`^E_5KGYTsL;`-wyTUz
z$Cg;LXy;YhYPB;u)Ra<_QLR!+nW?E!Tgx!j?=SDVlYc(v+~q9)bIyCXynea&w`Kt!
z7_J&3o+t}6=1=@9gnwKc!;Oi+P1p-}BY);1|C-}1jKZfFjA6Xo1mmzNCSW8cquxu$
z033-<W4vZG1$~%{^lfI@^+Ie*y#&?3Rt&}cr~&v;-yKJFbOwX)0w&;P)Igru&jV;g
z?T4Y>i^d50H?8akov|ekx}zE%fz5C%rs6CN!!4+R>_IhDi)#1?>boz|g(pxMy@i@c
zW2UcxCn94qY1o?nO%?^cn2Ra6%zmK~)#0b850BgR^B7J2D(brjs0Je$tp?`87MP0q
zeu#a43~GW?P?=eZUe>^@qQD@{dTfI`Q7Ju!dhw)PKZ|PMB5LjLp*jv?G@5xVrlSj$
znH>9m9wt#QK()UCHL#j!^8cZOlyM`D8{=dAA9_%mWDzR0%TP00iTs&z`~Du(1P&l$
zF-I^DPa#P$on!qSW?(z&IjFr+ikjF*vE=_Eg-ULW(gQ}(9?zg=a1XV1k5My?Bd?li
zCrrjPRH}3MHxn1&L?(0zHJ~1?$O;Zc4Ja42ltoCBW`&o6Qo0p2(~q$u)}cDSg381*
z)RH(_`|BadBuxY=GaaxIrlC6SiAwP>%*Ju38CRkvP>pKOTSq}7`vx_#^T=wLYuFnf
zqBdn0cA9<?#-To(ikewIs=<}0OuUPFuL9L!EoyJop$7Jy{rnO#F|WBvK_k75O37o?
z2a)U)EkQd}gUNUhd*F|F1y5luX{yH(7FHdMbdhd+6WzEMPhcn;K$$#`?eQnn{xeS-
z3ZycT^T>lF)BpyecKK-361h>C@}g$C3HAOVWX$FyYRPV37B*tbYl#M<GL?gx$b3|0
zN+tc9G79Rb919)%#G*11(ZPS5+Mss%1Z1pc25P2jQK{dKYOuntSD^-Y1T~Sf7>HL<
zoA@T`yGPh?{-4`7oa{U`9E+N13TkupN9~DWs1GNj_JG^2dyv&IOYHhq)Lz<!L3kJg
zu@2SlSN8q09m&5^dx0D3=q@UyPf?pMu9JTT*{BRmL8Wl6T`xg(REAnp3pps}b7W4Y
z9yOsSsE(b<{tULY9h6M|JM&-~H#EcdQK{dJ`tUHS<Kw6$I)@tYAE;FRhZ=Zzia!Ib
zP~Z1OwKo*|V-7aKt*8m?u%93FQqV|`p&Gh@dhsqc#eY#5(I_>8cvQz-Q4M9{C>)N#
zxZS>AfvMDMQK#xxRQnIGhCTKiwMV=)yrmhQM6FRh>cwB|`!`Vy+(!*4<RyP*qLF=S
zI-&<h*!RCcP3R0Vc5@%ezKQSZ|9&tIW&p1t1NWNE-8j>{a2+*(*zW!{ibu^j6P1zC
zNLywiYK_<83fzsK(V#2MKck;t_Ak*r)RKkLxR%m|`mP5mquJ=x`JY3f7dJ|fL75uV
zKrUklUPt|K+(Dh=`{=~rp8lWQSkyUhiMrnn^DzUJv3;m^4r3%9#b`W@F*^TODQIMm
zFcTvg4U;mXP#>;DHS``TwOj1^QRJYQZ&6Ej8}<G_s16()p%{$8FzkYQFCClX5cDb)
zITVzl#TbO^FdR4HIoydEq`0ULKOWSp`x^5%Zcg{lXmvjtqrL@8@e(HT{sgwZGPf*)
zpJnu-IzElseAhC_zc$GeZfK-Q1N>{3j@n#fP#=__ep<`z=T(?M{RHaV-^9rnLi*Is
zOxse_aovnM9o4A4REKK!>rAH4KpS@GD%3TNU@w{jR)^3Yj%sUC=)hj3)Rz;wDv4bx
za5W-Ih_ysE@fNY4c!gME{ScbqsIcyY#yJjIfzBk2pyAqPr8(mq`POh}l4F@wNV&#Z
z<Lnf;lBe^nPn^+hv@LoPV+jv2kJv%XAdL09Ga;&s!g_+GFq4P^D=Mr{$|6b|2`%?N
z;>9(S!aBP$757^6!{VY=P+DN$RoYft+rzq~ET)u8%p$Z6BZ#@g+e8*IoH$4<weEzq
z9zLDYY(iHNp%d`pdX<8HJG7Uo2p#9fgpRSBC?~Wp8ZPVg@VJyYc4Y$&A{N^9H5f_c
z+4W*;Q+R7fp|2*qAUJ+#aZzDE*CJ1Wr>Mk}>UzUH-JQSKJ;PO!zi_rMrbTgpZ(F=G
z$f`=b>RX>w<xCh~<mu-c=b7d%$n$s>rn-g{&YPL%ndSDlW-Kb6KHJy3`#XWYbG^QA
O;;R@C<gk31S^onDW_MWt

diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po
index b8857929abd..427aebc45be 100644
--- a/locale/de/LC_MESSAGES/bitcoin.po
+++ b/locale/de/LC_MESSAGES/bitcoin.po
@@ -184,8 +184,8 @@ msgid "From: "
 msgstr "Von: "
 
 #: ../../../ui.cpp:634
-msgid "From: unknown, Received with: "
-msgstr "Von: Unbekannt, Empfangen durch: "
+msgid "Received with: "
+msgstr "Empfangen durch: "
 
 #: ../../../ui.cpp:676
 msgid "Payment to yourself"
@@ -328,6 +328,14 @@ msgstr "Version 0.%d.%d Beta"
 msgid "Will appear as \"From: Unknown\""
 msgstr "Wird als \"Von: Unbekannt\" erscheinen"
 
+#: ../../../ui.cpp:1681
+msgid "n/a"
+msgstr "Unbekannt"
+
+#: ../../../ui.cpp:1681
+msgid "Unknown"
+msgstr "Unbekannt"
+
 #: ../../../ui.cpp:1682
 msgid "Can't include a message when sending to a Bitcoin address"
 msgstr "Beim überweisen an eine Bitcoin-Adresse kann keine Nachricht angegeben werden."
diff --git a/locale/es/LC_MESSAGES/bitcoin.mo b/locale/es/LC_MESSAGES/bitcoin.mo
index 8d7cf0ba686c564e1a1c7df603377aac1049d32b..da857ffd4f163d92e9f521c1ec3a5e1ad2558164 100644
GIT binary patch
delta 3805
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
M^AG>4=XB}xFPLv`hX4Qo

delta 3785
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
NDz+v4Qn5O@-~T>aaLE7w

diff --git a/locale/es/LC_MESSAGES/bitcoin.po b/locale/es/LC_MESSAGES/bitcoin.po
index b55a8daa70d..37297eec198 100644
--- a/locale/es/LC_MESSAGES/bitcoin.po
+++ b/locale/es/LC_MESSAGES/bitcoin.po
@@ -210,8 +210,8 @@ msgid "From: "
 msgstr "De: "
 
 #: ../../../ui.cpp:634
-msgid "From: unknown, Received with: "
-msgstr "De: desconocido, Recibido con: "
+msgid "Received with: "
+msgstr "Recibido con: "
 
 #: ../../../ui.cpp:676
 msgid "Payment to yourself"
@@ -357,6 +357,14 @@ msgstr "version %d.%d.%d beta"
 msgid "Will appear as \"From: Unknown\""
 msgstr "Aparecera como \"De: Desconocido\""
 
+#: ../../../ui.cpp:1696
+msgid "n/a"
+msgstr "Desconocido"
+
+#: ../../../ui.cpp:1696
+msgid "Unknown"
+msgstr "Desconocido"
+
 #: ../../../ui.cpp:1697
 msgid "Can't include a message when sending to a Bitcoin address"
 msgstr "No se ha podido incluir un mensaje mientras se enviaba la direccion Bitcoin"
diff --git a/locale/fr/LC_MESSAGES/bitcoin.mo b/locale/fr/LC_MESSAGES/bitcoin.mo
index 25db2af273fb7a77191ebec253db4a17e23e3478..59d28be895232d70e4fad19a5634122b9113627d 100644
GIT binary patch
delta 3868
zcmYk-c~F&A7{~F0AP6EVAh;n{Km?aua6!b9N)jQJOf%dd!CjUVF;Op?NN%}exi1mq
zk{gcJA3CKnF=I7~leRdHO)g_vjyhvDIZof-eUD9Nc<$$%_rC90o^$TY-38l9-PeMB
zDh=fj(Vke{*qA%`G=LAv?jU2D;~wmbN0C2sn~zX@j4iP#H~C`(`eA2mf<3SWCZg_3
zLmwQ6fyTH^HWfWM8yVY_*!CjqK)V9fK{YnTlc))tMLpMm8t5we;!TXid#H&7^02-S
zMfD$nx-S}=Grs9!zevJ1d@&f+aTW$+E_TBbY=%{+i5x?9bQ;xh9qPIB=)xaR8GVde
zNC?Z<#Cs!iGbz}P@l7Tb-8dWLaizWCIBLLis0SNt`&SI1eINClH?vfSF4V+&VrxuB
zJwMuBpNv{y0V*>q(9Is0^;DRo*@+Q&7?rZ`P&Zz-?Q5tGZlm_zi&<#kFx1LpaRBy2
zWoCxGUWC!KOHuvrLQU*c2>IXYMasAk&V?zhoCg=94oNvGwJT98TZjCa?e_XH)B?Uh
z=49$H2Y*D8W0Jz00W+{8?HQ=Eu^P3ogJI<V3YFtr7@;qiMGRg=t-y;sYK2WuD{PH%
z7=`?qbUvnFE{@egP!ox1OIENyY9hl?TbPYnXaOpd6>ch8;U0{|8q{I=9+iPVP+RfP
zw*NsE$H{Rr5{8XvMxh4ogi3894#!l~N-I$d*n#S=1~oDF5h|M58DtmCMeK(+QHQZT
zCrqz`RMdl+sFh`*GE;==cnK;at5Ek>p$0yTI$I}E6Rfx2|AH*gZEjJ~jPIgS^Ec{&
zmYfuAK@_UPc-)75@B&`LdOS?JF5!GORs&?Xm@H1hJgmk#4CDYPqYbDnzJfY`=BcN`
zpi!Qzni$js2BS`SCTg#ypi)+bTG<99NoFfDXLACzb(b&&AELIZ4@X}a8;0JPgIZ7?
z`Z2yKR0Zdw9w@^cFJm^Nw&n@b?Sp=uoQWhOi#20V9nVAEw+7YEc54-COAn&@{R$i7
zWz?2kMYkTfWiR|`eS&dZZ^VgICc2^qNVe^C)Rv7$tz?F^7`xCev+V<@pXUkG**S}i
z@mtiy8)C`7F5KY)W19P@nYHTdtTYlcXb(Ugw&kezz-IKry{L}&qb693@puL~9_Aiu
zivn1UzK=!q(-*Z>L*mH4QklzzZnzA!;-jb)o<Tiu0X6V-)S0-4+H)^PQ^y@p-*-p0
z-3&n8Hy*VGMW_XqqaPkXjZ^EUqEmkkIfv$|z2TYFmwYzidJyUmhNDu~3pKH!s1C<s
zDrVbujrA~UVJDH~nj5GsY1)-@!5MS6rlM5TahE!}f%=);LtlJ=TG<m+Dt)>;6LO(`
zZt<vzCu1p2M7;-oMjkPbuqV1+For*q$%htHhLK+E{|YMET-evcIpqP|tqHt@TIs9k
zkK<4&%tOzM24~W)!nLfVMK5PUyL&qstwl}ny!9IL@-z=n&j%)`U-rKf6{V(!b&Tf=
zV-}%iT7llU4t1zDp)zs|8{uix&+BW{fLCx7{*KD%i~M%AfK&{`k*N2`1Po?;Q$R&4
zU5eVnEyy;R>llPh`#K%9MV*x>)b%7($7!fTJPJc_4(eA`ff{HHhT<;Nf{vq}JB4oD
z@C_Bc5`RLi;2Elemi?R=hvOmIF&Iv&FX3g{cl#Uj8=gsYo~!1ce-`a8aVmx;kp*0c
z+R~{5o%hNt)K*juB>!5`5iV%O^%#baP%8;Yc79GBP!FV_QaawYbCGQ~Zd3-2Vh&zJ
z^_wur*_w3Jb2+H3n{M01gUG+WSY&T3M;2&06J>;oI^=Ac&(xq)5S4`XxE-PL3ZboQ
zPjH?Mi814d&k2%gMiN@UcH%W+6`?KIq5c1VSz{X`a0^jNEVS3EaJQ}N;LRhJ6T^uG
zL=EvWQ9^Vio|myy^iopU;NbbmtLl#6Ln+@&93WKoICwIXN!{1BU&oJZeHq3O+9qv5
z9HF1*G(u&wgXfo}YCN%(c#(LI(0TG<d~o)JE%y|5z*C0ssWYMSv4i;lHxhcPkXTQs
zBsrMH$dAUnNz5h+h@He_Vn3mx13unU<K3d3Cei3hyia^caG1^8#0)|unV9IQIUl2K
zeWf)4d)s;&oJ*`Dni18+^O8qpg>7Wxr$m5O;v$+5t%)(jBH~>_r4_N%Q{#<@dZnri
zBch2-L}Nnb4WgKsKujTcF?#+-%)})`3Xw+aBjyvKgvR%jx2#$C4l&iX^HFcD=Ou$m
zI1xk~Bw7;QM0X;WSWTo8DxVO$JT>Q|pRG@~uGP*BrZLA}D90AIE{be@07eqqh@tk{
ztlHT@GyQA-3NP^S&&zd{OrJX~$yGb4eXy_J==_=a1ts|#3#012^Lymf_K&_ESewxE
piBI6!nqpUOUSaX{Iouo9H`LEBEq`)Betz-BfyvMQt0xXh_!n34c9j4C

delta 3824
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
SlMoZ=Q!;Ppza?pL{r&@b<#Lh$

diff --git a/locale/fr/LC_MESSAGES/bitcoin.po b/locale/fr/LC_MESSAGES/bitcoin.po
index 46ee83c200c..735914cf73d 100644
--- a/locale/fr/LC_MESSAGES/bitcoin.po
+++ b/locale/fr/LC_MESSAGES/bitcoin.po
@@ -210,8 +210,8 @@ msgid "From: "
 msgstr "De: "
 
 #: ../../../ui.cpp:634
-msgid "From: unknown, Received with: "
-msgstr "De: Inconnu, reçu depuis: "
+msgid "Received with: "
+msgstr "Reçu depuis: "
 
 #: ../../../ui.cpp:676
 msgid "Payment to yourself"
@@ -358,6 +358,14 @@ msgstr "version %d.%d.%d beta"
 msgid "Will appear as \"From: Unknown\""
 msgstr "Apparaîtra ainsi \"De: Inconnu\""
 
+#: ../../../ui.cpp:1681
+msgid "n/a"
+msgstr "Inconnu"
+
+#: ../../../ui.cpp:1681
+msgid "Unknown"
+msgstr "Inconnu"
+
 #: ../../../ui.cpp:1697
 msgid "Can't include a message when sending to a Bitcoin address"
 msgstr "Impossible d'inclure un message lors d'un envoi à une adresse Bitcoin"
diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo
index 4a4f7a3fd14715dcee3372fc80e93f03672a6fd0..2ce12e2fb619f84a5a9a9f57b013eea36f210df9 100644
GIT binary patch
delta 3396
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
Kf5K`^8~z_+_jz;x

delta 3368
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
Dutjn_

diff --git a/locale/it/LC_MESSAGES/bitcoin.po b/locale/it/LC_MESSAGES/bitcoin.po
index ef75bf62198..c24174432af 100644
--- a/locale/it/LC_MESSAGES/bitcoin.po
+++ b/locale/it/LC_MESSAGES/bitcoin.po
@@ -184,8 +184,8 @@ msgid "From: "
 msgstr "Da: "
 
 #: ../../../ui.cpp:634
-msgid "From: unknown, Received with: "
-msgstr "Da: sconosciuto, Ricevuto con: "
+msgid "Received with: "
+msgstr "Ricevuto con: "
 
 #: ../../../ui.cpp:676
 msgid "Payment to yourself"
@@ -326,6 +326,14 @@ msgstr "versione 0.%d.%d beta"
 msgid "Will appear as \"From: Unknown\""
 msgstr "Apparirà come \"Da: Sconosciuto\""
 
+#: ../../../ui.cpp:1681
+msgid "n/a"
+msgstr "Sconosciuto"
+
+#: ../../../ui.cpp:1681
+msgid "Unknown"
+msgstr "Sconosciuto"
+
 #: ../../../ui.cpp:1682
 msgid "Can't include a message when sending to a Bitcoin address"
 msgstr "Non si può includere un messaggio quando si invia attraverso l'indirizzo Bitcoin"
diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo
index 2b515433b0c131fe48a91f055ac8a21de4c38a01..66015f31447eeffe074fa3cfc250dae67b9e212a 100644
GIT binary patch
delta 3277
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

delta 3243
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

diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po
index 54ef4d3c678..cfb05fb3c25 100644
--- a/locale/nl/LC_MESSAGES/bitcoin.po
+++ b/locale/nl/LC_MESSAGES/bitcoin.po
@@ -184,8 +184,8 @@ msgid "From: "
 msgstr "Van: "
 
 #: ../../../ui.cpp:634
-msgid "From: unknown, Received with: "
-msgstr "Van: onbekend, Ontvangen met: "
+msgid "Received with: "
+msgstr "Ontvangen met: "
 
 #: ../../../ui.cpp:676
 msgid "Payment to yourself"
@@ -327,6 +327,14 @@ msgstr "versie 0.%d.%d beta"
 msgid "Will appear as \"From: Unknown\""
 msgstr "Word vertoont als \"Van: Onbekend\""
 
+#: ../../../ui.cpp:1681
+msgid "n/a"
+msgstr "Onbekend"
+
+#: ../../../ui.cpp:1681
+msgid "Unknown"
+msgstr "Onbekend"
+
 #: ../../../ui.cpp:1682
 msgid "Can't include a message when sending to a Bitcoin address"
 msgstr "Kan geen mededeling versturen bij gebruik van Bitcoin adressen"
diff --git a/locale/pt/LC_MESSAGES/bitcoin.mo b/locale/pt/LC_MESSAGES/bitcoin.mo
index dceec49df2f019041e8746ba82b2649370fd360a..fc97f3956151a84d4bbdd01cb7540df4c7530a84 100644
GIT binary patch
delta 3402
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
TEUK>W73=c+ucE}dnUnP&)6RTg

delta 3376
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
M!R=g@XXt?c0lL9*uK)l5

diff --git a/locale/pt/LC_MESSAGES/bitcoin.po b/locale/pt/LC_MESSAGES/bitcoin.po
index 48102a1368a..c0e4fd65afe 100644
--- a/locale/pt/LC_MESSAGES/bitcoin.po
+++ b/locale/pt/LC_MESSAGES/bitcoin.po
@@ -184,8 +184,8 @@ msgid "From: "
 msgstr "Remetente: "
 
 #: ../../../ui.cpp:634
-msgid "From: unknown, Received with: "
-msgstr "Remetente: desconhecido, Recebido por: "
+msgid "Received with: "
+msgstr "Recebido por: "
 
 #: ../../../ui.cpp:676
 msgid "Payment to yourself"
@@ -326,6 +326,14 @@ msgstr "versão 0.%d.%d beta"
 msgid "Will appear as \"From: Unknown\""
 msgstr "Irá aparecer como \"De: Desconhecido\""
 
+#: ../../../ui.cpp:1681
+msgid "n/a"
+msgstr "Desconhecido"
+
+#: ../../../ui.cpp:1681
+msgid "Unknown"
+msgstr "Desconhecido"
+
 #: ../../../ui.cpp:1682
 msgid "Can't include a message when sending to a Bitcoin address"
 msgstr "Não é possível incluir uma mensagem ao enviar para um endereço Bitcoin"
diff --git a/main.cpp b/main.cpp
index 441f49aca1d..4b7146577c2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2224,7 +2224,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         // This includes all nodes that are currently online,
         // since they rebroadcast an addr every 24 hours
         pfrom->vAddrToSend.clear();
-        int64 nSince = GetAdjustedTime() - 24 * 60 * 60; // in the last 24 hours
+        int64 nSince = GetAdjustedTime() - 12 * 60 * 60; // in the last 12 hours
         CRITICAL_BLOCK(cs_mapAddresses)
         {
             unsigned int nSize = mapAddresses.size();
diff --git a/net.cpp b/net.cpp
index 1da1edbb11a..1cdecd09802 100644
--- a/net.cpp
+++ b/net.cpp
@@ -66,7 +66,7 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet)
     SOCKET hSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (hSocket == INVALID_SOCKET)
         return false;
-#if defined(__BSD__) || defined(__WXMAC_OSX__)
+#ifdef BSD
     int set = 1;
     setsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int));
 #endif
@@ -808,6 +808,7 @@ void ThreadSocketHandler2(void* parg)
 
 unsigned int pnSeed[] =
 {
+    // 2010/06
     0x35218252, 0x9c9c9618, 0xda6bacad, 0xb9aca862, 0x97c235c6,
     0x146f9562, 0xb67b9e4b, 0x87cf4bc0, 0xb83945d0, 0x984333ad,
     0xbbeec555, 0x6f0eb440, 0xe0005318, 0x7797e460, 0xddc60fcc,
@@ -818,6 +819,31 @@ unsigned int pnSeed[] =
     0xdd3462d0, 0x4e4d1448, 0x171df645, 0x84ee1155,
     0x248ac445, 0x0e634444, 0x0ded1b63, 0x30c01e60,
     0xa2b9a094, 0x29e4fd43, 0x9ce61b4c, 0xdae09744,
+
+    // 2010/08
+    0x5ae6bf43, 0x460be257, 0x7245c0cf, 0x4e0f028d, 0x26501760, 0x38643255, 0x67094f4f, 0x480449b8,
+    0x16545143, 0x1f082e5a, 0xaa428018, 0xe411e793, 0x14c1f862, 0x2726105b, 0x9b33ea50, 0xeeef86ca,
+    0xe3210d44, 0x0dca8b63, 0x3f9dfb18, 0x860340ad, 0xf33ba17a, 0x9018375c, 0x1de4e353, 0x0fa52dcb,
+    0x89c4555b, 0x109cf37b, 0x28c55b40, 0x04c801ae, 0x275c1e80, 0x6f7f745d, 0x7a2a5653, 0xa28e26d8,
+    0xa4e65db2, 0x99a06580, 0xf253ba44, 0x82cf6ab8, 0x859c2e8e, 0xf71a815d, 0xc18f1454, 0x71c8a943,
+    0x90d24e18, 0x311789b2, 0x74aba645, 0xde0bbfc3, 0xad724fad, 0xbf1ae15e, 0xbaa6fb54, 0x06e4d145,
+    0x51528645, 0x72120cd4, 0xd4cfd145, 0x0a7afed8, 0x9b9a5fad, 0x9e9ff45e, 0x10128355, 0xd44e8646,
+    0x04a07b47, 0x5fc9d547, 0xe0491e45, 0xbac21b41, 0x7aa31bae, 0x10483c5f, 0x94a23055, 0x73d9dc47,
+    0x1a99c247, 0x822fe847, 0x7e57ba48, 0xb19ea843, 0xa60621b2, 0x778cf163, 0x125c6556, 0xf94ba44f,
+    0xa61a0948, 0x6c839e4b, 0x29af5348, 0x68d84845, 0x752b95c3, 0xcf0d4663, 0x08e11e56, 0x75109550,
+    0x5f24b94c, 0x42426d4d, 0xfbbc0a4c, 0x70a9a246, 0xda7837cb, 0xae2a986d, 0xe283c358, 0x0c7ca954,
+    0x8e9bde59, 0x61521760, 0x6884444c, 0xa194e548, 0x9b8809cc, 0x16e96a8f, 0x956ff859, 0xfad5e555,
+    0x0ea70c80, 0x5b4ce26d, 0x7984444c, 0x1080d24a, 0x22a686cf, 0x6bf8c2ad, 0xb0f7485f, 0x06b66e56,
+    0x668373bc, 0x75506279, 0x3868694e, 0x12a5954b, 0x3a8b62d1, 0xb74fcbad, 0xa7dc3360, 0xc070b359,
+    0xa2b87242, 0xc45cab7c, 0x69882050, 0x14a5464b, 0x386acad5, 0x80b85db2, 0x1f78a062, 0xc608c55b,
+    0x4257d543, 0x7636ad80, 0x4432d655, 0xb2114d4b, 0x32639bd9, 0xadd75db2, 0x9be5a362, 0x6831bc5e,
+    0xf7f77046, 0x8f35ba81, 0x09bb4e59, 0xd0fb6b4e, 0xc5daa445, 0x9c611618, 0x355dcc62, 0xf2cf435e,
+    0x31e72c46, 0xdd8a43ad, 0x171f9c5b, 0xb4c2e355, 0xbe8af945, 0x613d3942, 0xe6f9e863, 0x7a3d855f,
+    0xa66adc47, 0x261089b2, 0x5a27105b, 0x6c28105b, 0xdd247946, 0xe6c3a445, 0x43a1ec63, 0x99b4dd5f,
+    0xb6834347, 0x5e9649bc, 0xf9dd545d, 0x6ae4c15b, 0xa5318a47, 0x7984ec47, 0x93a73b63, 0x0c60195f,
+    0xa5c85e4b, 0xa0a36dc2, 0x0739a95e, 0x3d44c15b, 0xfb940f4b, 0xd67c9148, 0x614f9876, 0x0a241c5f,
+    0xad9da74c, 0x4459abc8, 0x12e71b5f, 0x1c534a5d, 0x8ff5fc50, 0x2ca8864b, 0xd894fd80, 0x82ab3160,
+    0x390d804e, 0x2cf310cc, 0x680dad80, 0x691be15e, 0x5a8f4652, 0xaad0784d, 0x0d2431ad,
 };
 
 
@@ -1179,7 +1205,7 @@ bool BindListenPort(string& strError)
         return false;
     }
 
-#if defined(__BSD__) || defined(__WXMAC_OSX__)
+#ifdef BSD
     // Different way of disabling SIGPIPE on BSD
     setsockopt(hListenSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&nOne, sizeof(int));
 #endif
diff --git a/rpc.cpp b/rpc.cpp
index 0fef5398818..d03a7ce7678 100644
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -974,8 +974,8 @@ void ThreadRPCServer2(void* parg)
                 printf("ThreadRPCServer method=%s\n", strMethod.c_str());
 
                 // Observe lockdown
-                if (IsLockdown() && strMethod != "help" && strMethod != "stop" && strMethod != "getgenerate" && strMethod != "setgenerate")
-                    throw runtime_error("WARNING: Displayed transactions may not be correct!  You may need to upgrade.");
+                if (IsLockdown() && !mapArgs.count("-overridesafety") && strMethod != "help" && strMethod != "stop" && strMethod != "getgenerate" && strMethod != "setgenerate")
+                    throw runtime_error("WARNING: Displayed transactions may not be correct!  You may need to upgrade, or other nodes may need to upgrade.");
 
                 // Execute
                 map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);
diff --git a/serialize.h b/serialize.h
index 1afd6c0edc0..0c60bb9e03c 100644
--- a/serialize.h
+++ b/serialize.h
@@ -20,7 +20,7 @@ class CDataStream;
 class CAutoFile;
 
 static const int VERSION = 308;
-static const char* pszSubVer = ".3";
+static const char* pszSubVer = ".4";
 
 
 
diff --git a/ui.cpp b/ui.cpp
index a6305fe1bdb..885adeaa82c 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -515,7 +515,7 @@ string SingleLine(const string& strIn)
 {
     string strOut;
     bool fOneSpace = false;
-    foreach(int c, strIn)
+    foreach(unsigned char c, strIn)
     {
         if (isspace(c))
         {
@@ -640,7 +640,7 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
                         {
                             //strDescription += _("Received payment to ");
                             //strDescription += _("Received with address ");
-                            strDescription += _("From: unknown, Received with: ");
+                            strDescription += _("Received with: ");
                             string strAddress = PubKeyToAddress(vchPubKey);
                             map<string, string>::iterator mi = mapAddressBook.find(strAddress);
                             if (mi != mapAddressBook.end() && !(*mi).second.empty())
@@ -1559,6 +1559,11 @@ void SetStartOnSystemStartup(bool fAutoStart)
     }
     else
     {
+        char pszExePath[MAX_PATH+1];
+        memset(pszExePath, 0, sizeof(pszExePath));
+        if (readlink("/proc/self/exe", pszExePath, sizeof(pszExePath)-1) == -1)
+            return;
+
         boost::filesystem::create_directories(GetAutostartDir());
 
         boost::filesystem::ofstream optionFile(GetAutostartFilePath(), ios_base::out|ios_base::trunc);
@@ -1568,9 +1573,6 @@ void SetStartOnSystemStartup(bool fAutoStart)
             return;
         }
         // Write a bitcoin.desktop file to the autostart directory:
-        char pszExePath[MAX_PATH+1];
-        memset(pszExePath, 0, sizeof(pszExePath));
-        readlink("/proc/self/exe", pszExePath, sizeof(pszExePath)-1);
         optionFile << "[Desktop Entry]\n";
         optionFile << "Type=Application\n";
         optionFile << "Name=Bitcoin\n";
@@ -1858,7 +1860,7 @@ void CSendDialog::OnTextAddress(wxCommandEvent& event)
     {
         strFromSave    = m_textCtrlFrom->GetValue();
         strMessageSave = m_textCtrlMessage->GetValue();
-        m_textCtrlFrom->SetValue(_("Will appear as \"From: Unknown\""));
+        m_textCtrlFrom->SetValue(_("n/a"));
         m_textCtrlMessage->SetValue(_("Can't include a message when sending to a Bitcoin address"));
     }
     else if (fEnable && !fEnabledPrev)
diff --git a/util.h b/util.h
index 9ec701b9e76..bf8cf300fd2 100644
--- a/util.h
+++ b/util.h
@@ -430,8 +430,9 @@ inline void heapchk()
 template<typename T1>
 inline uint256 Hash(const T1 pbegin, const T1 pend)
 {
+    static unsigned char pblank[1];
     uint256 hash1;
-    SHA256((unsigned char*)&pbegin[0], (pend - pbegin) * sizeof(pbegin[0]), (unsigned char*)&hash1);
+    SHA256((pbegin == pend ? pblank : (unsigned char*)&pbegin[0]), (pend - pbegin) * sizeof(pbegin[0]), (unsigned char*)&hash1);
     uint256 hash2;
     SHA256((unsigned char*)&hash1, sizeof(hash1), (unsigned char*)&hash2);
     return hash2;
@@ -441,11 +442,12 @@ template<typename T1, typename T2>
 inline uint256 Hash(const T1 p1begin, const T1 p1end,
                     const T2 p2begin, const T2 p2end)
 {
+    static unsigned char pblank[1];
     uint256 hash1;
     SHA256_CTX ctx;
     SHA256_Init(&ctx);
-    SHA256_Update(&ctx, (unsigned char*)&p1begin[0], (p1end - p1begin) * sizeof(p1begin[0]));
-    SHA256_Update(&ctx, (unsigned char*)&p2begin[0], (p2end - p2begin) * sizeof(p2begin[0]));
+    SHA256_Update(&ctx, (p1begin == p1end ? pblank : (unsigned char*)&p1begin[0]), (p1end - p1begin) * sizeof(p1begin[0]));
+    SHA256_Update(&ctx, (p2begin == p2end ? pblank : (unsigned char*)&p2begin[0]), (p2end - p2begin) * sizeof(p2begin[0]));
     SHA256_Final((unsigned char*)&hash1, &ctx);
     uint256 hash2;
     SHA256((unsigned char*)&hash1, sizeof(hash1), (unsigned char*)&hash2);
@@ -457,12 +459,13 @@ inline uint256 Hash(const T1 p1begin, const T1 p1end,
                     const T2 p2begin, const T2 p2end,
                     const T3 p3begin, const T3 p3end)
 {
+    static unsigned char pblank[1];
     uint256 hash1;
     SHA256_CTX ctx;
     SHA256_Init(&ctx);
-    SHA256_Update(&ctx, (unsigned char*)&p1begin[0], (p1end - p1begin) * sizeof(p1begin[0]));
-    SHA256_Update(&ctx, (unsigned char*)&p2begin[0], (p2end - p2begin) * sizeof(p2begin[0]));
-    SHA256_Update(&ctx, (unsigned char*)&p3begin[0], (p3end - p3begin) * sizeof(p3begin[0]));
+    SHA256_Update(&ctx, (p1begin == p1end ? pblank : (unsigned char*)&p1begin[0]), (p1end - p1begin) * sizeof(p1begin[0]));
+    SHA256_Update(&ctx, (p2begin == p2end ? pblank : (unsigned char*)&p2begin[0]), (p2end - p2begin) * sizeof(p2begin[0]));
+    SHA256_Update(&ctx, (p3begin == p3end ? pblank : (unsigned char*)&p3begin[0]), (p3end - p3begin) * sizeof(p3begin[0]));
     SHA256_Final((unsigned char*)&hash1, &ctx);
     uint256 hash2;
     SHA256((unsigned char*)&hash1, sizeof(hash1), (unsigned char*)&hash2);