Ticket #7372: mail.diff

src/apps/mail/Utilities.cpp

@@ -71 +71 @@
     ssize_t size = node->ReadAttr(attr, B_STRING_TYPE, 0,
         value->LockBuffer(attrInfo.size + 1), attrInfo.size);
 
-    value->UnlockBuffer();  
+    if (size < 0)
+        value->UnlockBuffer(0);
+    else
+        value->UnlockBuffer(size);
 
     return size >= 0 ? B_OK : size;
 }

src/apps/mail/MailWindow.cpp

@@ -181 +181 @@
     if (messenger != NULL)
         fTrackerMessenger = *messenger;
 
-    char str[256];
-    char status[272];
     float height;
     BMenu* menu;
     BMenu* subMenu;
     BMenuItem* item;
     BMessage* msg;
-    attr_info info;
     BFile file(ref, B_READ_ONLY);
 
     if (ref) {
@@ -240 +237 @@
         menu->AddSeparatorItem();
 
         subMenu = new BMenu(B_TRANSLATE("Close and "));
-        if (file.GetAttrInfo(B_MAIL_ATTR_STATUS, &info) == B_NO_ERROR)
-            file.ReadAttr(B_MAIL_ATTR_STATUS, B_STRING_TYPE, 0, str, info.size);
-        else
-            str[0] = 0;
+        BString attribute;
+        ReadAttrString(&file, B_MAIL_ATTR_STATUS, &attribute);
 
-        if (!strcmp(str, "New")) {
+        if (attribute == "New") {
             subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Leave as New"),
                 new BMessage(B_QUIT_REQUESTED), 'W', B_SHIFT_KEY));
 #if 0
@@ -253 +248 @@
                 new BMessage(M_CLOSE_READ), 'W'));
 #endif
         } else {
-            if (strlen(str))
-                sprintf(status, B_TRANSLATE("Leave as '%s'"), str);
-            else
-                sprintf(status, B_TRANSLATE("Leave same"));
-            subMenu->AddItem(item = new BMenuItem(status,
-                            new BMessage(B_QUIT_REQUESTED), 'W'));
+            BString label = B_TRANSLATE("Leave as '%s'");
+            label.ReplaceFirst("%s", attribute);
+
+            if (attribute.Length() <= 0)
+                label = B_TRANSLATE("Leave same");
+
+            subMenu->AddItem(item = new BMenuItem(label,
+                new BMessage(B_QUIT_REQUESTED), 'W'));
             AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY,
                 new BMessage(B_QUIT_REQUESTED));
         }

src/apps/mail/MailSupport.cpp

@@ -150 +150 @@
 
             message->AddString("attribute", value.String());
 
-            char name[256];
+            BString name;
             if (format != NULL)
-                snprintf(name, sizeof(name), format, value.String());
+                name.SetToFormat("format", value.String());
             else
-                strlcpy(name, value.String(), sizeof(name));
+                name = value;
 
             if (index < 9 && !popup)
                 menu->AddItem(new BMenuItem(name, message, '1' + index));