[Nym3-commit] r425 - trunk/nymbaron/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-11-22 22:34:41 +0100 (Tue, 22 Nov 2005)
New Revision: 425

Modified:
   trunk/nymbaron/Client/Main.py
Log:
- bugfix (ask for the password only once in Summarize) [client]


Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-11-22 19:21:54 UTC (rev 424)
+++ trunk/nymbaron/Client/Main.py	2005-11-22 21:34:41 UTC (rev 425)
@@ -456,12 +456,12 @@
     if not max: max = config.max_syn
     account = get_account_from_nickname(ui, config, nickname,
 	    "No nickname given, abort\nUse -n <nickname>")
+    secring = decode_secring(config, ui)
     if older:
 	if is_hex_mid(older):
 	    older = binascii.unhexlify(older)
 	else:
 	    try:
-		secring = decode_secring(config, ui)
 		l = decode_message_references([older], ['syn'],
 		    {'syn': (build_syn_index, (secring, account))})
 	    except DecodeException, inst:
@@ -479,7 +479,6 @@
 	older = chr(0) * 20
     summ = Message.Summarize()
     summ.fromData(max, older)
-    secring = decode_secring(config, ui)
     idKey = _cr.pk_decode_private_key(secring.get_key(account['idKey']))
     account.sendControl([summ], idKey, "request summaries")
     ui.display("Summary request sent")