diff options
Diffstat (limited to 'src/core/renderer/MCAddressDisplay.cc')
| -rw-r--r-- | src/core/renderer/MCAddressDisplay.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/renderer/MCAddressDisplay.cc b/src/core/renderer/MCAddressDisplay.cc index 27229e18..dd2d559a 100644 --- a/src/core/renderer/MCAddressDisplay.cc +++ b/src/core/renderer/MCAddressDisplay.cc @@ -31,12 +31,12 @@ String * AddressDisplay::shortDisplayStringForAddress(Address * address) String * AddressDisplay::veryShortDisplayStringForAddress(Address * address) { if ((address->displayName() != NULL) && (address->displayName()->length() > 0)) { - Array * components; - String * senderName; + Array * components; + String * senderName; - senderName = address->displayName(); + senderName = address->displayName(); senderName = (String *) senderName->copy()->autorelease(); - + senderName->replaceOccurrencesOfString(MCSTR(","), MCSTR(" ")); senderName->replaceOccurrencesOfString(MCSTR("'"), MCSTR(" ")); senderName->replaceOccurrencesOfString(MCSTR("\""), MCSTR(" ")); @@ -45,10 +45,10 @@ String * AddressDisplay::veryShortDisplayStringForAddress(Address * address) return MCLOCALIZEDSTRING(MCSTR("invalid")); } return (String *) components->objectAtIndex(0); - } + } else if (address->mailbox()) { - return address->mailbox(); - } + return address->mailbox(); + } else { return MCLOCALIZEDSTRING(MCSTR("invalid")); } @@ -56,7 +56,7 @@ String * AddressDisplay::veryShortDisplayStringForAddress(Address * address) String * AddressDisplay::displayStringForAddresses(Array * addresses) { - return Address::nonEncodedRFC822StringForAddresses(addresses); + return Address::nonEncodedRFC822StringForAddresses(addresses); } String * AddressDisplay::shortDisplayStringForAddresses(Array * addresses) |