mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 11:04:01 +02:00
Code Issues Releases Wiki Activity

Ensure we have a string to show if a Tp account name is empty.

Browse Source
This commit is contained in:
Teo Mrnjavac
2013-06-29 12:39:07 +02:00
parent b08ba3fe40
commit 484b7ccb88
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp
View File

@@ -236,7 +236,13 @@ Tomahawk::Accounts::TelepathyConfigStorage::load( const QString& accountId, Acco
Tp::AccountPtr account = m_tpam->accountForObjectPath( accountIdToTelepathyPath( accountId ) ); Tp::AccountPtr account = m_tpam->accountForObjectPath( accountIdToTelepathyPath( accountId ) );
cfg.accountFriendlyName = "Tp:" + account->normalizedName(); if ( !account->normalizedName().isEmpty() )
cfg.accountFriendlyName = account->normalizedName();
else if ( !account->parameters()[ "account" ].isNull() )
cfg.accountFriendlyName = account->parameters()[ "account" ].toString();
if ( cfg.accountFriendlyName.isEmpty() ) //this should never happen
cfg.accountFriendlyName = accountId;
cfg.enabled = true; cfg.enabled = true;
cfg.acl = QVariantMap(); cfg.acl = QVariantMap();