* Deleting a message from the Trash folder now actually deletes it instead

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 6fb26541e9c73e2e7a2f3f1e78b21a5dd6ecd16a..f91bb406a6323aeb7b5f93854e53576d84dc6f17 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -2709,10 +2709,6 @@ DONE:    wDumpContent(1);
 
 
 
-
-
-
-
 void delete_msg(void)
 {
        long msgid;
@@ -2722,7 +2718,13 @@ void delete_msg(void)
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       if (WC->wc_is_trash) {  /* Delete from Trash is a real delete */
+               serv_printf("DELE %ld", msgid); 
+       }
+       else {                  /* Otherwise move it to Trash */
+               serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       }
+
        serv_getln(buf, sizeof buf);
        wprintf("<EM>%s</EM><br />\n", &buf[4]);