Merge pull request #6 from maran/master

Select default from address on compose screen

bitmessagemain.py

@@ -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.
 
         self.rerenderComboBoxSendFrom()
+        if(self.ui.comboBoxSendFrom.count() > 0):
+            self.redrawLabelFrom(self.ui.comboBoxSendFrom.currentIndex())
+
         
         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
         sys.exit()