From c2f493b59509477c97d151c5cf87e22811df782a Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Sat, 22 Jun 2013 10:55:15 -0400 Subject: [PATCH 1/2] Fix issue #246 --- src/bitmessagemain.py | 1 - src/helper_startup.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 52e89846..0806afc9 100644 --- a/src/bitmessagemain.py +++ b/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 diff --git a/src/helper_startup.py b/src/helper_startup.py index b7e9e607..3cea3a30 100644 --- a/src/helper_startup.py +++ b/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 From f1d2b042eacc004410504cb6976c7d1f4978c5f4 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Sun, 23 Jun 2013 02:38:21 -0400 Subject: [PATCH 2/2] add import sys to class_sqlThread.py --- src/class_sqlThread.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/class_sqlThread.py b/src/class_sqlThread.py index 210a78e3..f54d5a86 100644 --- a/src/class_sqlThread.py +++ b/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