From 484b7ccb88c560bc809de86a8dfc4f13885e0f68 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 29 Jun 2013 12:39:07 +0200 Subject: [PATCH] Ensure we have a string to show if a Tp account name is empty. --- .../configstorage/telepathy/TelepathyConfigStorage.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp index 5349ad395..92a48af6f 100644 --- a/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp +++ b/src/libtomahawk/accounts/configstorage/telepathy/TelepathyConfigStorage.cpp @@ -236,7 +236,13 @@ Tomahawk::Accounts::TelepathyConfigStorage::load( const QString& accountId, Acco 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.acl = QVariantMap();