[haiku-commits] r40434 - in haiku/trunk/src: add-ons/mail_daemon/inbound_protocols/imap/imap_lib kits/mail preferences/mail
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 10 Feb 2011 22:46:41 +0100 (CET)
Author: czeidler
Date: 2011-02-10 22:46:41 +0100 (Thu, 10 Feb 2011)
New Revision: 40434
Changeset: http://dev.haiku-os.org/changeset/40434
Modified:
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
haiku/trunk/src/kits/mail/ProtocolConfigView.cpp
haiku/trunk/src/preferences/mail/AutoConfigView.cpp
Log:
Fix partial download limit. Cleanup.
Modified:
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
===================================================================
---
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
2011-02-10 20:25:40 UTC (rev 40433)
+++
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
2011-02-10 21:46:41 UTC (rev 40434)
@@ -410,6 +410,7 @@
if (uid >= 0)
fIMAPMailbox.Listener().HeaderFetched(uid, data);
+printf("fFetchBodyLimit %i\n", (int)fFetchBodyLimit);
if (fFetchBodyLimit >= 0 && fFetchBodyLimit <= messageSize)
return true;
@@ -622,7 +623,8 @@
fIMAPMailbox.Listener().NewMessagesToFetch(exists - nMessages);
- command = new FetchMessageCommand(fIMAPMailbox, nMessages + 1, exists);
+ command = new FetchMessageCommand(fIMAPMailbox, nMessages + 1, exists,
+ fIMAPMailbox.FetchBodyLimit());
fIMAPMailbox.AddAfterQuakeCommand(command);
TRACE("EXISTS %i\n", (int)exists);
Modified:
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
===================================================================
---
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
2011-02-10 20:25:40 UTC (rev 40433)
+++
haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
2011-02-10 21:46:41 UTC (rev 40434)
@@ -54,6 +54,7 @@
BPositionIO* data);
void SetFetchBodyLimit(int32
limit);
+ int32 FetchBodyLimit() {
return fFetchBodyLimit; }
status_t FetchMessage(int32
messageNumber);
status_t FetchMessages(int32
firstMessage,
int32
lastMessage);
Modified: haiku/trunk/src/kits/mail/ProtocolConfigView.cpp
===================================================================
--- haiku/trunk/src/kits/mail/ProtocolConfigView.cpp 2011-02-10 20:25:40 UTC
(rev 40433)
+++ haiku/trunk/src/kits/mail/ProtocolConfigView.cpp 2011-02-10 21:46:41 UTC
(rev 40434)
@@ -62,13 +62,19 @@
{
const BMessage* settings = &addonSettings.Settings();
- if (settings->HasInt32(kPartialDownloadLimit)) {
+ int32 limit = 0;
+ if (settings->HasInt32(kPartialDownloadLimit))
+ limit = int32(settings->FindInt32(kPartialDownloadLimit) /
1024);
+ if (limit < 0) {
+ fPartialBox->SetValue(B_CONTROL_ON);
+ fSizeBox->SetEnabled(false);
+ } else {
BString kb;
- kb << int32(settings->FindInt32(kPartialDownloadLimit)/1024);
- fSizeBox->SetText(kb.String());
+ kb << limit;
+ fSizeBox->SetText(kb);
fPartialBox->SetValue(B_CONTROL_ON);
- } else
fSizeBox->SetEnabled(true);
+ }
}
@@ -101,8 +107,11 @@
BodyDownloadConfig::Archive(BMessage* into, bool) const
{
into->RemoveName(kPartialDownloadLimit);
- if (fPartialBox->Value())
+ if (fPartialBox->Value() == B_CONTROL_ON)
into->AddInt32(kPartialDownloadLimit, atoi(fSizeBox->Text()) *
1024);
+ else
+ into->AddInt32(kPartialDownloadLimit, -1);
+
return B_OK;
}
Modified: haiku/trunk/src/preferences/mail/AutoConfigView.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfigView.cpp 2011-02-10 20:25:40 UTC
(rev 40433)
+++ haiku/trunk/src/preferences/mail/AutoConfigView.cpp 2011-02-10 21:46:41 UTC
(rev 40434)
@@ -46,8 +46,8 @@
// email view
topLeft.y += stepSize;
rightDown.y += stepSize;
- fEmailView = new BTextControl(BRect(topLeft, rightDown),
- "email", "E-mail address:", "", new BMessage(kEMailChangedMsg));
+ fEmailView = new BTextControl(BRect(topLeft, rightDown), "email",
+ "E-mail address:", "", new BMessage(kEMailChangedMsg));
fEmailView->SetDivider(divider);
AddChild(fEmailView);
@@ -333,8 +333,8 @@
fInboundEncryptionMenu->MoveTo(10, 80);
}
if (info.inboundType == IMAP) {
- item = fInboundEncryptionMenu->Menu()
- ->ItemAt(info.providerInfo.ssl_imap);
+ item = fInboundEncryptionMenu->Menu()->ItemAt(
+ info.providerInfo.ssl_imap);
if (item)
item->SetMarked(true);
fInboundEncryptionMenu->MoveTo(10, 50);
@@ -361,9 +361,8 @@
serverName = info.providerInfo.smtp_server;
fOutboundNameView = new BTextControl(BRect(10, 20, rect.Width() - 20,
30),
-
"outbound", B_TRANSLATE("Server name:"),
-
serverName.String(),
- new
BMessage(kServerChangedMsg));
+ "outbound", B_TRANSLATE("Server name:"), serverName.String(),
+ new BMessage(kServerChangedMsg));
fOutboundNameView->SetDivider(divider);
box->AddChild(fOutboundNameView);
@@ -371,8 +370,8 @@
GetAuthEncrMenu(info.outboundProtocol, &fOutboundAuthMenu,
&fOutboundEncryptionMenu);
if (fOutboundAuthMenu) {
- BMenuItem *item = fOutboundAuthMenu->Menu()
-
->ItemAt(info.providerInfo.authentification_smtp);
+ BMenuItem *item = fOutboundAuthMenu->Menu()->ItemAt(
+ info.providerInfo.authentification_smtp);
if (item)
item->SetMarked(true);
fOutboundAuthItemStart = item;
@@ -381,8 +380,8 @@
fOutboundAuthMenu->MoveTo(10, 50);
}
if (fOutboundEncryptionMenu) {
- BMenuItem *item = fOutboundEncryptionMenu->Menu()
-
->ItemAt(info.providerInfo.ssl_smtp);
+ BMenuItem *item = fOutboundEncryptionMenu->Menu()->ItemAt(
+ info.providerInfo.ssl_smtp);
if (item)
item->SetMarked(true);
fOutboundEncrItemStart = item;
Other related posts:
- » [haiku-commits] r40434 - in haiku/trunk/src: add-ons/mail_daemon/inbound_protocols/imap/imap_lib kits/mail preferences/mail - clemens . zeidler
