Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain

src/bitmessagemain.py

@@ -14,7 +14,6 @@ lengthOfTimeToLeaveObjectsInInventory = 237600  # Equals two days and 18 hours.
 lengthOfTimeToHoldOnToAllPubkeys = 2419200  # Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time.
 maximumAgeOfObjectsThatIAdvertiseToOthers = 216000  # Equals two days and 12 hours
 maximumAgeOfNodesThatIAdvertiseToOthers = 10800  # Equals three hours
-storeConfigFilesInSameDirectoryAsProgramByDefault = False  # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
 useVeryEasyProofOfWorkForTesting = False  # If you set this to True while on the normal network, you won't be able to send or sometimes receive messages.
 encryptedBroadcastSwitchoverTime = 1369735200
 

src/class_sqlThread.py

@@ -3,6 +3,7 @@ import shared
 import sqlite3
 import time
 import shutil  # used for moving the messages.dat file
+import sys
 
 # This thread exists because SQLITE3 is so un-threadsafe that we must
 # submit queries to it and it puts results back in a different queue. They

src/helper_startup.py

@@ -1,6 +1,9 @@
 import shared
 import ConfigParser
-import time
+import sys
+import os
+
+storeConfigFilesInSameDirectoryAsProgramByDefault = False  # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
 
 def loadConfig():
     # First try to load the config file (the keys.dat file) from the program