i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup, use case insensitive mime comparison, mark automatic only if none other is marked

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9925 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-11-11 12:26:44 +00:00
parent eed1255a5c
commit adddd452bf
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/bemail/Header.cpp
+10 -8
View File
@@ -172,18 +172,18 @@ THeaderView::THeaderView (
BString name(charset.GetPrintName()); BString name(charset.GetPrintName());
const char * mime = charset.GetMIMEName(); const char * mime = charset.GetMIMEName();
if (mime) { if (mime) {
name.Append(" ("); name << " (" << mime << ")";
name.Append(mime);
name.Append(")");
} }
msg = new BMessage(kMsgEncoding); msg = new BMessage(kMsgEncoding);
if ((mime == 0) || (strcmp(mime, "UTF-8") != 0)) { int32 convert_id;
msg->AddInt32("charset", charset.GetConversionID()); if ((mime == 0) || (strcasecmp(mime, "UTF-8") != 0)) {
convert_id = charset.GetConversionID();
} else { } else {
msg->AddInt32("charset", B_MAIL_UTF8_CONVERSION); convert_id = B_MAIL_UTF8_CONVERSION;
} }
msg->AddInt32("charset", convert_id);
fEncodingMenu->AddItem(item = new BMenuItem(name.String(), msg)); fEncodingMenu->AddItem(item = new BMenuItem(name.String(), msg));
if (charset.GetConversionID() == fCharacterSetUserSees && !marked_charset) { if (convert_id == fCharacterSetUserSees && !marked_charset) {
item->SetMarked(true); item->SetMarked(true);
marked_charset = true; marked_charset = true;
} }
@@ -205,7 +205,9 @@ THeaderView::THeaderView (
msg = new BMessage(kMsgEncoding); msg = new BMessage(kMsgEncoding);
msg->AddInt32("charset", B_MAIL_NULL_CONVERSION); msg->AddInt32("charset", B_MAIL_NULL_CONVERSION);
fEncodingMenu->AddItem(item = new BMenuItem("Automatic", msg)); fEncodingMenu->AddItem(item = new BMenuItem("Automatic", msg));
item->SetMarked(true); if (!marked_charset) {
item->SetMarked(true);
}
} }
// First line of the header, From for reading e-mails (includes the // First line of the header, From for reading e-mails (includes the
src/apps/bemail/Prefs.cpp
+7 -7
View File
@@ -891,18 +891,18 @@ TPrefsWindow::BuildEncodingMenu(uint32 encoding)
BString name(charset.GetPrintName()); BString name(charset.GetPrintName());
const char * mime = charset.GetMIMEName(); const char * mime = charset.GetMIMEName();
if (mime) { if (mime) {
name.Append(" ("); name << " (" << mime << ")";
name.Append(mime);
name.Append(")");
} }
msg = new BMessage(P_ENC); msg = new BMessage(P_ENC);
if ((mime == 0) || (strcmp(mime, "UTF-8") != 0)) { int convert_id;
msg->AddInt32("encoding", charset.GetConversionID()); if ((mime == 0) || (strcasecmp(mime, "UTF-8") != 0)) {
convert_id = charset.GetConversionID();
} else { } else {
msg->AddInt32("encoding", B_MAIL_UTF8_CONVERSION); convert_id = B_MAIL_UTF8_CONVERSION;
} }
msg->AddInt32("encoding", convert_id);
menu->AddItem(item = new BMenuItem(name.String(), msg)); menu->AddItem(item = new BMenuItem(name.String(), msg));
if (charset.GetConversionID() == encoding) { if (convert_id == encoding) {
item->SetMarked(true); item->SetMarked(true);
} }
} }