mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Do not double-escape &, and manually decode '+' to " " as QUrl won't

Browse Source
This commit is contained in:
Leo Franchi
2012-12-08 23:21:29 -05:00
parent f359e60b2a
commit de48618b15
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/GlobalActionManager.cpp
View File

@@ -309,6 +309,7 @@ GlobalActionManager::parseTomahawkLink( const QString& urlIn )
{ {
QString cmd = url.mid( 11 ); QString cmd = url.mid( 11 );
cmd.replace( "%2B", "%20" ); cmd.replace( "%2B", "%20" );
cmd.replace( "+", "%20" ); // QUrl doesn't parse '+' into " "
tLog() << "Parsing tomahawk link command" << cmd; tLog() << "Parsing tomahawk link command" << cmd;
QString cmdType = cmd.split( "/" ).first(); QString cmdType = cmd.split( "/" ).first();
@@ -1440,7 +1441,6 @@ GlobalActionManager::percentEncode( const QUrl& url ) const
data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid. data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid.
data.replace( "%20", "+" ); data.replace( "%20", "+" );
data.replace( "&", "%26" );
return data; return data;
} }