hrev53300 adds 2 changesets to branch 'master'
old head: d8d7f0ae9dee7fdc482f8ec2c8951d26500d872a
new head: 32f97c7c1e2abc55cbcbee45d9f9a4eabf5954e3
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=32f97c7c1e2a+%5Ed8d7f0ae9dee
----------------------------------------------------------------------------
46511867cc2d: IMAP: Correct typos and translate more strings.
32f97c7c1e2a: registrar: Add missing initialization of error.
Spotted by korli.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 9 insertions(+), 10 deletions(-)
.../inbound_protocols/imap/FolderConfigWindow.cpp | 15 +++++++--------
src/servers/registrar/TRoster.cpp | 4 ++--
############################################################################
Commit: 46511867cc2dfa2699701c6aaa183ab7734e42b9
URL: https://git.haiku-os.org/haiku/commit/?id=46511867cc2d
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jul 27 16:57:13 2019 UTC
IMAP: Correct typos and translate more strings.
----------------------------------------------------------------------------
diff --git
a/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp
b/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp
index 67d3220758..c225abc36a 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp
@@ -310,7 +310,7 @@ void
FolderConfigWindow::_LoadFolders()
{
StatusWindow* statusWindow = new StatusWindow(this,
- B_TRANSLATE("Fetching IMAP folders, have patience"
B_UTF8_ELLIPSIS));
+ B_TRANSLATE("Fetching IMAP folders, please be patient"
B_UTF8_ELLIPSIS));
statusWindow->Show();
status_t status = fProtocol.Connect(fSettings.ServerAddress(),
@@ -345,12 +345,11 @@ FolderConfigWindow::_LoadFolders()
uint64 used, total;
if (fProtocol.GetQuota(used, total) == B_OK) {
- char buffer[256];
- BString quotaString = "Server storage: ";
- quotaString += string_for_size(used, buffer, 256);
- quotaString += " / ";
- quotaString += string_for_size(total, buffer, 256);
- quotaString += " used.";
+ BString quotaString;
+ char usedBuffer[128], totalBuffer[128];
+ quotaString.SetToFormat(B_TRANSLATE("Server storage: %s / %s
used."),
+ string_for_size(used, usedBuffer, 128),
+ string_for_size(total, totalBuffer, 128));
fQuotaView->SetText(quotaString);
}
@@ -374,7 +373,7 @@ FolderConfigWindow::_ApplyChanges()
return;
StatusWindow* status = new StatusWindow(this,
- B_TRANSLATE("Update subcription of IMAP folders, have patience"
+ B_TRANSLATE("Updating subscriptions to IMAP folders, please be
patient"
B_UTF8_ELLIPSIS));
status->Show();
############################################################################
Revision: hrev53300
Commit: 32f97c7c1e2abc55cbcbee45d9f9a4eabf5954e3
URL: https://git.haiku-os.org/haiku/commit/?id=32f97c7c1e2a
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jul 27 17:00:38 2019 UTC
registrar: Add missing initialization of error.
Spotted by korli.
----------------------------------------------------------------------------
diff --git a/src/servers/registrar/TRoster.cpp
b/src/servers/registrar/TRoster.cpp
index 6e95f894d4..d72a020eef 100644
--- a/src/servers/registrar/TRoster.cpp
+++ b/src/servers/registrar/TRoster.cpp
@@ -681,7 +681,7 @@ TRoster::HandleGetAppInfo(BMessage* request)
// get the info
RosterAppInfo* info = NULL;
- status_t error;
+ status_t error = B_OK;
if (hasTeam) {
info = fRegisteredApps.InfoFor(team);
if (info == NULL)
@@ -732,7 +732,7 @@ TRoster::HandleGetAppList(BMessage* request)
// get the parameters
const char* signature;
error = request->FindString("signature", &signature);
-
+
// reply to the request
if (error == B_OK) {
BMessage reply(B_REG_SUCCESS);
