[Nym3-commit] r359 - in trunk/nymbaron: Client doc

[jr at conuropsis.org]

Author: jr
Date: 2005-10-16 14:27:17 +0200 (Sun, 16 Oct 2005)
New Revision: 359

Modified:
   trunk/nymbaron/Client/Main.py
   trunk/nymbaron/doc/nymbaron.xml
Log:
- Add mbox references to the delete command


Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-10-16 12:16:03 UTC (rev 358)
+++ trunk/nymbaron/Client/Main.py	2005-10-16 12:27:17 UTC (rev 359)
@@ -475,8 +475,11 @@
     delmsg = Message.Delete()
     secring = decode_secring(config, ui)
     try:
-	midlist = decode_message_references(midlist, ['syn'],
-	        {'syn': (build_syn_index, (secring, account))})
+	midlist = decode_message_references(midlist, ['syn', 'mbox'],
+	        {
+		'syn': (build_syn_index, (secring, account)),
+		'mbox': (build_mbox_index, (account))
+		})
     except DecodeException, inst:
 	ui.display(str(inst))
 	sys.exit(1)
@@ -759,8 +762,9 @@
 	parser = OptionParser(usage = 
 	"""nymbaron delete [options] [ref1 [ref2 [...]]]
 	Ask the server to delete the messages corresponding to the provided
-	references. The references are either mids or syn:N where N is the index
-	provided by the list-syn command.""")
+	references. The references are either mids, syn:N where N is the index
+	provided by the list-syn command, or mbox:N where N is the index
+	provided by the list-mbox command.""")
 	parser.add_option("-n", "--nickname", action = "store",
 			  dest = "nickname", help = "The nickname "
 			  "of the account whose emails to delete")

Modified: trunk/nymbaron/doc/nymbaron.xml
===================================================================
--- trunk/nymbaron/doc/nymbaron.xml	2005-10-16 12:16:03 UTC (rev 358)
+++ trunk/nymbaron/doc/nymbaron.xml	2005-10-16 12:27:17 UTC (rev 359)
@@ -122,7 +122,8 @@
     <para>
 	Request email deletion on the server. The account must be precised by
 	the user. The user gives a list of mid, either by mid or by
-	reference ('syn:N', where N is the index of the mid in the synbox).
+	reference ('syn:N', where N is the index of the mid in the synbox or
+	'mbox:N, where N is the index of the mid in the mbox).
     </para>
     <para>
 	This command enables the user to authorize a message to be deleted on