From 3277ad7802f926f72f6ca5e262d984135f2917b2 Mon Sep 17 00:00:00 2001 From: Alejandro Wainzinger Date: Wed, 8 Jun 2011 01:37:52 -0700 Subject: [PATCH] Parse the "+" of a Tomahawk link as a space. Adium plugin defaults to using toma.hk links now. --- src/libtomahawk/globalactionmanager.cpp | 7 ++++--- src/libtomahawk/globalactionmanager.h | 2 +- src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index e98702b24..bf60833f6 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -78,9 +78,9 @@ GlobalActionManager::openLinkFromQuery( const Tomahawk::query_ptr& query ) const } QUrl -GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album ) const +GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album, bool tomahk ) const { - QUrl link( "tomahawk://open/track/" ); + QUrl link( tomahk ? "http://toma.hk/open/track/" : "tomahawk://open/track/" ); if( !title.isEmpty() ) link.addQueryItem( "title", title ); @@ -172,8 +172,9 @@ GlobalActionManager::copyToClipboard( const Tomahawk::query_ptr& query ) const bool GlobalActionManager::parseTomahawkLink( const QString& url ) { - if( url.contains( "tomahawk://" ) ) { + if( url.contains( "tomahawk://" ) ) { QString cmd = url.mid( 11 ); + cmd.replace( "%2B", "%20" ); qDebug() << "Parsing tomahawk link command" << cmd; QString cmdType = cmd.split( "/" ).first(); diff --git a/src/libtomahawk/globalactionmanager.h b/src/libtomahawk/globalactionmanager.h index 5e5e11928..d8186559a 100644 --- a/src/libtomahawk/globalactionmanager.h +++ b/src/libtomahawk/globalactionmanager.h @@ -36,7 +36,7 @@ public: virtual ~GlobalActionManager(); QUrl openLinkFromQuery( const Tomahawk::query_ptr& query ) const; - QUrl openLink( const QString& title, const QString& artist, const QString& album ) const; + QUrl openLink( const QString& title, const QString& artist, const QString& album, bool tomahk=false ) const; void copyToClipboard( const Tomahawk::query_ptr& query ) const; QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist ); diff --git a/src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp b/src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp index ecfcb90aa..137d22d3e 100644 --- a/src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp @@ -157,7 +157,7 @@ AdiumPlugin::openLinkFromHash( const Tomahawk::InfoSystem::InfoCriteriaHash& has album = hash["album"]; } - return GlobalActionManager::instance()->openLink( title, artist, album ); + return GlobalActionManager::instance()->openLink( title, artist, album, true ); } void