Fixed ReadChangeAttributes behaviour, cosmetic fixes

This commit is contained in:
Alexander S. Aganichev 2001-11-27 21:15:28 +00:00
parent f332ab3c06
commit ba8f0be2ac
3 changed files with 18 additions and 9 deletions

View File

@ -241,11 +241,12 @@ void DoKludges(int mode, GMsg* msg, int kludges) {
// Strip all the kludges we insert ourselves // Strip all the kludges we insert ourselves
int stripkludges = (~kludges)&(GKLUD_RFC|GKLUD_FWD|GKLUD_INTL|GKLUD_FMPT|GKLUD_TOPT|GKLUD_FLAGS|GKLUD_AREA|GKLUD_MSGID|GKLUD_REPLY|GKLUD_PID|GKLUD_CHARSET|GKLUD_KNOWN|GKLUD_PATH|GKLUD_SEENBY); if(kludges == 0)
kludges = (GKLUD_RFC|GKLUD_FWD|GKLUD_INTL|GKLUD_FMPT|GKLUD_TOPT|GKLUD_FLAGS|GKLUD_AREA|GKLUD_MSGID|GKLUD_REPLY|GKLUD_PID|GKLUD_CHARSET|GKLUD_KNOWN|GKLUD_PATH|GKLUD_SEENBY);
while(line) { while(line) {
if(line->kludge & stripkludges) { if(line->kludge & kludges) {
bool waswrapped; bool waswrapped;
do { do {
waswrapped = (line->type & GLINE_WRAP) ? true : false; waswrapped = (line->type & GLINE_WRAP) ? true : false;
@ -504,12 +505,19 @@ void DoKludges(int mode, GMsg* msg, int kludges) {
} }
if(AA->Internetrfcbody() and not AA->isnewsgroup() and line->next) { if(AA->Internetrfcbody() and not AA->isnewsgroup() and line->next) {
const char *nline_txt = line->next->txt.c_str(); do {
if(not strblank(nline_txt) and not strnieql(nline_txt, "XPost:", 6) and const char *nline_txt = line->next->txt.c_str();
not strnieql(nline_txt, "Copy:", 5) and not strnieql(nline_txt, "BCopy:", 6)) { if(strblank(nline_txt))
line = AddKludge(line, ""); break;
line->kludge = GKLUD_RFC; else if(not strnieql(nline_txt, "XPost:", 6) and
} not strnieql(nline_txt, "Copy:", 5) and
not strnieql(nline_txt, "BCopy:", 6)) {
line = AddKludge(line, "");
line->kludge = GKLUD_RFC;
break;
}
line = line->next;
} while(line->next);
} }
} }
else { else {

View File

@ -2561,6 +2561,7 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
else { else {
if(headerlines) { if(headerlines) {
linep->type |= GLINE_KLUD; linep->type |= GLINE_KLUD;
linep->kludge = GKLUD_RFC;
linep->color = C_READK; linep->color = C_READK;
} }
if(--irfcbody == 0) if(--irfcbody == 0)

View File

@ -856,7 +856,7 @@ bool guserbase::lookup_addressbook(GMsg* msg, char* name, char* aka, bool browse
found = true; found = true;
if(not strblank(entry.iaddr) and not AA->isinternet()) { if(not entry.fidoaddr.valid() and not strblank(entry.iaddr) and not AA->isinternet()) {
// do UUCP addressing // do UUCP addressing
strcpy(msg->realto, entry.name); strcpy(msg->realto, entry.name);
if(*AA->Internetgate().name) if(*AA->Internetgate().name)