[Nym3-commit] r247 - trunk/nym3/Client

[laurent at conuropsis.org]

Author: laurent
Date: 2005-05-07 14:13:03 +0200 (Sat, 07 May 2005)
New Revision: 247

Modified:
   trunk/nym3/Client/Main.py
Log:
list-mbox is meant as "list full mbox", not "list those emails for which we have the synopsis".


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-05-07 12:11:07 UTC (rev 246)
+++ trunk/nym3/Client/Main.py	2005-05-07 12:13:03 UTC (rev 247)
@@ -402,16 +402,13 @@
 	    "No nickname given, abort\nUse -n <nickname>")
     synbox = account.get_synbox()
     mbox = account.get_mbox()
-    index = 1
-    count = 0
-    for (midlist, bf, enc_synset) in synbox:
-	for (i, mid) in enumerate(midlist):
-	    if mbox.has_key(mid):
-		count += 1
-		ui.display("%d %s" % (index + i, binascii.hexlify(mid)))
-		ui.display(Mail.syn_summary(mbox[mid]))
-	index += len(midlist)
-    assert count == len(mbox.keys())
+    index = 0
+    secring = decode_secring(config, ui)
+    for mid in mbox.keys():
+	ui.display("%d %s" % (index, binascii.hexlify(mid)))
+	clear = decipher_string(mbox[mid], secring, account['encKeys'])
+	ui.display(Mail.syn_summary(clear))
+	index = index + 1
 
 def export(ui, config, nickname, output = None, args = []):
     account = get_account_from_nickname(ui, config, nickname,