Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit d60d3bec d60d3bec2f8aebb0c1e57e1c99bb96afd69c18c2 by Sergey Poznyakoff
Options

Save messages that were marked for saving to mbox and then deleted

1 parent 7faf960d
Inline Side-by-side
Showing 1 changed file with 5 additions and 2 deletions
...@@ -94,9 +94,10 @@ mail_mbox_commit () ...@@ -94,9 +94,10 @@ mail_mbox_commit ()
94 message_get_attribute (msg, &attr); 94 message_get_attribute (msg, &attr);
95 95
96 if (!is_user_mbox 96 if (!is_user_mbox
97 && !attribute_is_deleted (attr)
98 && (attribute_is_userflag (attr, MAIL_ATTRIBUTE_MBOXED) 97 && (attribute_is_userflag (attr, MAIL_ATTRIBUTE_MBOXED)
99 || (!hold && attribute_is_read (attr)))) 98 || (!hold
99 && !attribute_is_deleted (attr)
100 && attribute_is_read (attr))))
100 { 101 {
101 int status; 102 int status;
102 103
...@@ -122,6 +123,8 @@ mail_mbox_commit () ...@@ -122,6 +123,8 @@ mail_mbox_commit ()
122 saved_count++; 123 saved_count++;
123 } 124 }
124 } 125 }
126 else if (attribute_is_deleted (attr))
127 /* Skip this one */;
125 else if (!keepsave && attribute_is_userflag (attr, MAIL_ATTRIBUTE_SAVED)) 128 else if (!keepsave && attribute_is_userflag (attr, MAIL_ATTRIBUTE_SAVED))
126 attribute_set_deleted (attr); 129 attribute_set_deleted (attr);
127 else if (attribute_is_read (attr)) 130 else if (attribute_is_read (attr))
......