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

Merge branch 'stable'

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-29 16:22:16 -04:00
parent 7c8b65a1d3 b59399aecb
commit de4df0060e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1,4 +1,5 @@
Version 0.0.3: Version 0.0.3:
* Fix crashes in Twitter authentication. For reals now.
* Properly honor the chosen port number if a static host and port are * Properly honor the chosen port number if a static host and port are
marked as preferred. marked as preferred.

2
src/sip/SipHandler.cpp
View File

@@ -183,7 +183,7 @@ SipHandler::connectPlugins( bool startup, const QString &pluginName )
{ {
int result = QMessageBox::question( int result = QMessageBox::question(
TomahawkApp::instance()->mainWindow(), "Legal Warning", TomahawkApp::instance()->mainWindow(), "Legal Warning",
"By pressing OK below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemify the Tomahawk developers and project from liability should you choose to break those laws.\n\nFor more information, please see http://gettomahawk.com/legal", "By pressing OK below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.\n\nFor more information, please see http://gettomahawk.com/legal",
"I Do Not Agree", "I Agree" "I Do Not Agree", "I Agree"
); );
if ( result != 1 ) if ( result != 1 )