1999-12-27 00:58:54 +00:00
|
|
|
|
--- pine/newmail.c.orig Tue Nov 2 08:13:10 1999
|
|
|
|
|
+++ pine/newmail.c Fri Nov 19 16:18:24 1999
|
|
|
|
|
@@ -318,24 +318,15 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
ENVELOPE *e;
|
|
|
|
|
char subject[200], from[2*MAX_SCREEN_COLS],
|
|
|
|
|
intro[MAX_SCREEN_COLS+1];
|
|
|
|
|
- static char *carray[] = { "regarding",
|
|
|
|
|
- "concerning",
|
|
|
|
|
- "about",
|
|
|
|
|
- "as to",
|
|
|
|
|
- "as regards",
|
|
|
|
|
- "as respects",
|
|
|
|
|
- "in re",
|
|
|
|
|
- "re",
|
|
|
|
|
- "respecting",
|
|
|
|
|
- "in point of",
|
|
|
|
|
- "with regard to",
|
|
|
|
|
- "subject:"
|
|
|
|
|
+ static char *carray[] = { "<22><><EFBFBD><EFBFBD>",
|
1999-11-01 00:41:02 +00:00
|
|
|
|
+ "<22><><EFBFBD><EFBFBD>",
|
|
|
|
|
+ "<22><><EFBFBD>D<EFBFBD><44><EFBFBD>G"
|
1998-08-09 00:51:28 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
e = mail_fetchstructure(stream, max_num, NULL);
|
|
|
|
|
|
|
|
|
|
if(e && e->from){
|
|
|
|
|
- sprintf(from, " %srom ", (number > 1L) ? "Most recent f" : "F");
|
1999-11-01 00:41:02 +00:00
|
|
|
|
+ sprintf(from, " %srom ", (number > 1L) ? "<22>̪<EFBFBD><CCAA><EFBFBD>" : "<22><>");
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if(e->from->personal)
|
|
|
|
|
istrncpy(from + ((number > 1L) ? 18 : 6),
|
|
|
|
|
(char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
|
1999-12-27 00:58:54 +00:00
|
|
|
|
@@ -352,13 +343,13 @@
|
1998-08-09 00:51:28 +00:00
|
|
|
|
|
|
|
|
|
if(number <= 1L) {
|
|
|
|
|
if(e && e->subject){
|
|
|
|
|
- sprintf(subject, " %s ", carray[(unsigned)random()%12]);
|
|
|
|
|
+ sprintf(subject, " %s ", carray[(unsigned)random()%2]);
|
|
|
|
|
istrncpy(subject + strlen(subject),
|
|
|
|
|
(char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
|
|
|
|
|
e->subject, NULL), 100);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
- strcpy(subject, " with no subject");
|
|
|
|
|
+ strcpy(subject, " <20>S<EFBFBD><53><EFBFBD>D<EFBFBD>D");
|
|
|
|
|
|
|
|
|
|
if(!from[0])
|
|
|
|
|
subject[1] = toupper((unsigned char)subject[1]);
|
1999-12-27 00:58:54 +00:00
|
|
|
|
@@ -368,29 +359,29 @@
|
1999-11-01 00:41:02 +00:00
|
|
|
|
|
|
|
|
|
if(!folder) {
|
|
|
|
|
if(number > 1)
|
|
|
|
|
- sprintf(intro, "%ld new messages!", number);
|
|
|
|
|
+ sprintf(intro, "%ld <20>ʷs<CAB7>H<EFBFBD><48><EFBFBD>I", number);
|
|
|
|
|
else
|
|
|
|
|
- sprintf(intro, "New mail%s!",
|
|
|
|
|
- (e && address_is_us(e->to, ps_global)) ? " to you" : "");
|
|
|
|
|
+ sprintf(intro, "%s<>s<EFBFBD>H<EFBFBD>I",
|
|
|
|
|
+ (e && address_is_us(e->to, ps_global)) ? "<22>z<EFBFBD><7A>" : "");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
long fl, tot, newfl;
|
|
|
|
|
|
|
|
|
|
if(number > 1)
|
|
|
|
|
- sprintf(intro, "%ld messages saved to folder \"%s\"", number,
|
|
|
|
|
+ sprintf(intro, "%ld <20>ʫH<CAAB><48><EFBFBD>Q<EFBFBD>s<EFBFBD>ܸ<EFBFBD><DCB8>ƧX \"%s\"", number,
|
|
|
|
|
folder);
|
|
|
|
|
else
|
|
|
|
|
- sprintf(intro, "Mail saved to folder \"%s\"", folder);
|
|
|
|
|
+ sprintf(intro, "<22>H<EFBFBD><48><EFBFBD>Q<EFBFBD>s<EFBFBD>ܸ<EFBFBD><DCB8>ƧX \"%s\"", folder);
|
|
|
|
|
|
|
|
|
|
if((fl=strlen(folder)) > 10 &&
|
|
|
|
|
(tot=strlen(intro) + strlen(from) + strlen(subject)) >
|
|
|
|
|
ps_global->ttyo->screen_cols - 2){
|
|
|
|
|
newfl = max(10, fl-(tot-(ps_global->ttyo->screen_cols - 2)));
|
|
|
|
|
if(number > 1)
|
|
|
|
|
- sprintf(intro, "%ld messages saved to folder \"...%s\"", number,
|
|
|
|
|
+ sprintf(intro, "%ld <20>ʫH<CAAB><48><EFBFBD>Q<EFBFBD>s<EFBFBD>ܸ<EFBFBD><DCB8>ƧX \"...%s\"", number,
|
|
|
|
|
folder+(fl-(newfl-3)));
|
|
|
|
|
else
|
|
|
|
|
- sprintf(intro, "Mail saved to folder \"...%s\"",
|
|
|
|
|
+ sprintf(intro, "<22>H<EFBFBD><48><EFBFBD>Q<EFBFBD>s<EFBFBD>ܸ<EFBFBD><DCB8>ƧX \"...%s\"",
|
|
|
|
|
folder+(fl-(newfl-3)));
|
|
|
|
|
}
|
|
|
|
|
}
|