Commit 7fb09d93 authored by putro's avatar putro

fix after merge

parents fbe1deb5 c23ff3c2
......@@ -240,12 +240,7 @@ def sendMixMsg(dest, msg, subj="subject", test=False, chain=""):
raise MixError('Could not find mixmaster binary.')
<<<<<<< HEAD
def writeMessage(subject="", recipient="", text="", test=0):
=======
def writeMessage():
>>>>>>> master
"""
Create a message to be sent from nym
The message has to be sent through a remailer chain
......@@ -255,7 +250,6 @@ def writeMessage():
config['last_message'] = "ERROR - select your nym, actual selection HAS NOT a secret key"
menu()
<<<<<<< HEAD
if subject == "":
while True:
subject = askSomething('Insert message subject: ')
......@@ -268,7 +262,6 @@ def writeMessage():
if recipient == "":
recipient = raw_input("Insert recipient email address or newsgroup name: ")
=======
while True:
subject = askSomething('Insert message subject: ')
if isAscii(subject):
......@@ -279,7 +272,19 @@ def writeMessage():
continue
recipient = raw_input("Insert recipient email address or newsgroup name: ")
>>>>>>> master
if subject == "":
while True:
subject = askSomething('Insert message subject: ')
if isAscii(subject):
break
else:
print "ERROR: subject contains not ascii characters, try again"
pressKey()
continue
if recipient == "":
recipient = raw_input("Insert recipient email address or newsgroup name: ")
if text == "":
if X_is_running():
......@@ -328,21 +333,7 @@ def modifyConfig():
pass
<<<<<<< HEAD
def chooseChain(chain=""):
=======
if checks.OptionsCheck(config) is True:
config['last_message'] = "OK, initial check passed"
if not nyms.sections:
print "No nyms configured, going to create it..."
createNym()
else:
setActiveNym(nyms.sections[0])
def chooseChain():
>>>>>>> master
""" Print remailer list and prompt for chain choice """
if chain != "":
config['remailer_chain'] = [chain]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment