mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

Fallback from Source::friendlyName() to dbFriendlyName() to nodeId()

Browse Source
This commit is contained in:
Dominik Schmidt
2013-01-28 01:10:48 +01:00
parent 537336adac
commit 009c06f693
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/Source.cpp
View File

@@ -125,14 +125,7 @@ QString
Source::friendlyName() const Source::friendlyName() const
{ {
if ( m_friendlyname.isEmpty() ) if ( m_friendlyname.isEmpty() )
return m_nodeId; return dbFriendlyName();
//TODO: this is a terrible assumption, help me clean this up, mighty muesli!
if ( m_friendlyname.contains( "@conference." ) )
return QString( m_friendlyname ).remove( 0, m_friendlyname.lastIndexOf( "/" ) + 1 ).append( " via MUC" );
if ( m_friendlyname.contains( "/" ) )
return m_friendlyname.left( m_friendlyname.indexOf( "/" ) );
return m_friendlyname; return m_friendlyname;
} }
@@ -178,6 +171,9 @@ Source::setFriendlyName( const QString& fname )
QString QString
Source::dbFriendlyName() const Source::dbFriendlyName() const
{ {
if( m_dbFriendlyName.isEmpty() )
return nodeId();
return m_dbFriendlyName; return m_dbFriendlyName;
} }