Merge pull request #6 from maran/master

Select default from address on compose screen
This commit is contained in:
Jonathan Warren 2012-11-29 08:32:14 -08:00
commit 367a01bd87

View File

@ -2445,6 +2445,9 @@ class MyForm(QtGui.QMainWindow):
#Below this point, it would be good if all of the necessary global data structures were initialized.
if(self.ui.comboBoxSendFrom.count() > 0):
self.listOfOutgoingSynSenderThreads = [] #if we don't maintain this list, the threads will get garbage-collected.
@ -3403,8 +3406,9 @@ averageProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be pe
payloadLengthExtraBytes = 14000 #To make sending short messages a little more difficult, this value is added to the payload length for use in calculating the proof of work target.
if __name__ == "__main__":
major, minor, revision = sqlite3.sqlite_version_info
if major < 3:
sqlite_version = sqlite3.sqlite_version_info
# Check the Major version, the first element in the array
if sqlite_version[0] < 3:
print 'This program requires sqlite version 3 or higher because 2 and lower cannot store NULL values. I see version:', sqlite3.sqlite_version_info
@ -3482,4 +3486,4 @@ if __name__ == "__main__":
# So far, the Bitmessage protocol, this client, the Wiki, and the forums
# are all a one-man operation. Bitcoin tips are quite appreciated!
# 1H5XaDA6fYENLbknwZyjiYXYPQaFjjLX2u
# 1H5XaDA6fYENLbknwZyjiYXYPQaFjjLX2u