Permalink
Browse files

Calendar display name tweaks. (svn #458)

  • Loading branch information...
1 parent 9d763e4 commit 4fa5aef4439503f8edd4613ba3260af659a8fed6 cyrusdaboo committed with Jul 27, 2012
@@ -97,7 +97,7 @@ void CCalendarPropDialog::SetCalList(calstore::CCalendarStoreNodeList* cal_list)
// Add name if single calendar
if (mCalList->size() == 1)
{
- title += mCalList->front()->GetName();
+ title += mCalList->front()->GetAccountDisplayName();
}
// Now set window title
@@ -1034,7 +1034,7 @@ iCal::CICalendar* CCalendarStoreManager::PickCalendar(const iCal::CICalendarComp
for(iCal::CICalendarList::const_iterator iter = mReceivableCalendars.begin(); iter != mReceivableCalendars.end(); iter++, cal_pos++)
{
const CCalendarStoreNode* node = GetNode(*iter);
- cdstring name = node ? node->GetAccountName(HasMultipleProtocols()) : (*iter)->GetName();
+ cdstring name = node ? node->GetAccountDisplayName(HasMultipleProtocols()) : (*iter)->GetName();
if (name.empty())
{
name = rsrc::GetString("::NumberedCalendar");
@@ -521,7 +521,7 @@ void CCalendarStoreNode::MoveCalendar(const CCalendarStoreNode* dir, bool siblin
cdstring new_name;
// Must have item and it must be a directory or protocol
- if (!dir || !dir->IsProtocol() && !dir->IsDirectory())
+ if (!dir || (!dir->IsProtocol() && !dir->IsDirectory()))
return;
// Check for sibling

0 comments on commit 4fa5aef

Please sign in to comment.