]> git.pld-linux.org Git - packages/mutt.git/blame - mutt-cd.purge_message.patch
projects / packages / mutt.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 3
[packages/mutt.git] / mutt-cd.purge_message.patch
CommitLineData
d66e5ee8 1diff -pruN1 mutt-1.3.25.trash_folder/OPS mutt-1.3.25.purge_command/OPS
2--- mutt-1.3.25.trash_folder/OPS Tue Sep 11 12:50:50 2001
3+++ mutt-1.3.25.purge_command/OPS Wed Jan 9 20:40:27 2002
4@@ -136,2 +136,3 @@ OP_PREV_PAGE "move to the previous page"
5 OP_PRINT "print the current entry"
6+OP_PURGE_MESSAGE "really delete the current entry, bypassing the trash folder"
7 OP_QUERY "query external program for addresses"
8diff -pruN1 mutt-1.3.25.trash_folder/curs_main.c mutt-1.3.25.purge_command/curs_main.c
9--- mutt-1.3.25.trash_folder/curs_main.c Thu Nov 8 09:56:02 2001
10+++ mutt-1.3.25.purge_command/curs_main.c Wed Jan 9 20:40:27 2002
11@@ -1615,2 +1615,3 @@ int mutt_index_menu (void)
12
13+ case OP_PURGE_MESSAGE:
14 case OP_DELETE:
15@@ -1623,2 +1624,4 @@ int mutt_index_menu (void)
16 mutt_tag_set_flag (M_DELETE, 1);
17+ if (op == OP_PURGE_MESSAGE)
18+ mutt_tag_set_flag (M_PURGED, 1);
19 if (option (OPTDELETEUNTAG))
20@@ -1630,2 +1633,4 @@ int mutt_index_menu (void)
21 mutt_set_flag (Context, CURHDR, M_DELETE, 1);
22+ if (op == OP_PURGE_MESSAGE)
23+ mutt_set_flag (Context, CURHDR, M_PURGED, 1);
24 if (option (OPTDELETEUNTAG))
25@@ -1908,2 +1913,3 @@ int mutt_index_menu (void)
26 mutt_tag_set_flag (M_DELETE, 0);
27+ mutt_tag_set_flag (M_PURGED, 0);
28 menu->redraw = REDRAW_INDEX;
29@@ -1913,2 +1919,3 @@ int mutt_index_menu (void)
30 mutt_set_flag (Context, CURHDR, M_DELETE, 0);
31+ mutt_set_flag (Context, CURHDR, M_PURGED, 0);
32 if (option (OPTRESOLVE) && menu->current < Context->vcount - 1)
33@@ -1932,5 +1939,7 @@ int mutt_index_menu (void)
34 rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0,
35- op == OP_UNDELETE_THREAD ? 0 : 1);
36+ op == OP_UNDELETE_THREAD ? 0 : 1)
37+ + mutt_thread_set_flag (CURHDR, M_PURGED, 0,
38+ op == OP_UNDELETE_THREAD ? 0 : 1);
39
40- if (rc != -1)
41+ if (rc > -1)
42 {
43diff -pruN1 mutt-1.3.25.trash_folder/flags.c mutt-1.3.25.purge_command/flags.c
44--- mutt-1.3.25.trash_folder/flags.c Wed Jan 9 20:39:31 2002
45+++ mutt-1.3.25.purge_command/flags.c Wed Jan 9 20:40:27 2002
46@@ -100,2 +100,12 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
47
48+ case M_PURGED:
49+ if (bf)
50+ {
51+ if (!h->purged)
52+ h->purged = 1;
53+ }
54+ else if (h->purged)
55+ h->purged = 0;
56+ break;
57+
58 case M_NEW:
59diff -pruN1 mutt-1.3.25.trash_folder/functions.h mutt-1.3.25.purge_command/functions.h
60--- mutt-1.3.25.trash_folder/functions.h Tue Sep 11 12:51:39 2001
61+++ mutt-1.3.25.purge_command/functions.h Wed Jan 9 20:40:27 2002
62@@ -100,2 +100,3 @@ struct binding_t OpMain[] = {
63 { "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" },
64+ { "purge-message", OP_PURGE_MESSAGE, NULL },
65 { "query", OP_QUERY, "Q" },
66@@ -184,2 +185,3 @@ struct binding_t OpPager[] = {
67 { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" },
68+ { "purge-message", OP_PURGE_MESSAGE, NULL },
69 { "quit", OP_QUIT, "Q" },
70diff -pruN1 mutt-1.3.25.trash_folder/mutt.h mutt-1.3.25.purge_command/mutt.h
71--- mutt-1.3.25.trash_folder/mutt.h Wed Jan 9 20:39:31 2002
72+++ mutt-1.3.25.purge_command/mutt.h Wed Jan 9 20:40:27 2002
73@@ -187,2 +187,3 @@ enum
74 M_APPENDED,
75+ M_PURGED,
76 M_FLAG,
77@@ -620,2 +621,3 @@ typedef struct header
78 unsigned int appended : 1; /* has been saved */
79+ unsigned int purged : 1; /* bypassing the trash folder */
80 unsigned int deleted : 1;
81diff -pruN1 mutt-1.3.25.trash_folder/mx.c mutt-1.3.25.purge_command/mx.c
82--- mutt-1.3.25.trash_folder/mx.c Wed Jan 9 20:39:31 2002
83+++ mutt-1.3.25.purge_command/mx.c Wed Jan 9 20:40:27 2002
84@@ -841,2 +841,3 @@ static int trash_append (CONTEXT *ctx)
85 if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended
86+ && !ctx->hdrs[i]->purged
87 && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
88diff -pruN1 mutt-1.3.25.trash_folder/pager.c mutt-1.3.25.purge_command/pager.c
89--- mutt-1.3.25.trash_folder/pager.c Fri Dec 21 01:21:03 2001
90+++ mutt-1.3.25.purge_command/pager.c Wed Jan 9 20:40:27 2002
91@@ -2148,2 +2148,3 @@ mutt_pager (const char *banner, const ch
92
93+ case OP_PURGE_MESSAGE:
94 case OP_DELETE:
95@@ -2152,2 +2153,3 @@ mutt_pager (const char *banner, const ch
96 mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
97+ mutt_set_flag (Context, extra->hdr, M_PURGED, 1);
98 if (option (OPTDELETEUNTAG))
99@@ -2461,2 +2463,3 @@ mutt_pager (const char *banner, const ch
100 mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
101+ mutt_set_flag (Context, extra->hdr, M_PURGED, 0);
102 redraw = REDRAW_STATUS | REDRAW_INDEX;
103@@ -2475,5 +2478,7 @@ mutt_pager (const char *banner, const ch
104 r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
105+ ch == OP_UNDELETE_THREAD ? 0 : 1)
106+ + mutt_thread_set_flag (extra->hdr, M_PURGED, 0,
107 ch == OP_UNDELETE_THREAD ? 0 : 1);
108
109- if (r != -1)
110+ if (r > -1)
111 {
112diff -pruN1 mutt-1.3.25.trash_folder/pattern.c mutt-1.3.25.purge_command/pattern.c
113--- mutt-1.3.25.trash_folder/pattern.c Mon Dec 3 11:17:57 2001
114+++ mutt-1.3.25.purge_command/pattern.c Wed Jan 9 20:40:27 2002
115@@ -1172,4 +1172,6 @@ int mutt_pattern_func (int op, char *pro
116 {
117- case M_DELETE:
118 case M_UNDELETE:
119+ mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_PURGED,
120+ 0);
121+ case M_DELETE:
122 mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_DELETE,
123diff -pruN mutt-1.3.25.orig/PATCHES mutt-1.3.25/PATCHES
124--- mutt-1.3.25.orig/PATCHES Mon Nov 26 20:16:52 2001
125+++ mutt-1.3.25/PATCHES Thu Dec 6 16:27:55 2001
126@@ -1,0 +1 @@
127+patch-1.3.25.cd.purge_command.2
The Mutt Mail User Agent
This page took 0.035039 seconds and 4 git commands to generate.