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

Merge branch 'master' of github.com:tomahawk-player/tomahawk

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-03 22:13:19 -04:00
parent f4508fc79a 255b251230
commit 20045b2e14
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/sip/SipHandler.cpp
View File

@@ -248,6 +248,7 @@ SipHandler::addSipPlugin( SipPlugin* p, bool enabled, bool startup )
{ {
m_allPlugins << p; m_allPlugins << p;
hookUpPlugin( p );
if ( enabled ) if ( enabled )
{ {
p->connectPlugin( startup ); p->connectPlugin( startup );

16
src/libtomahawk/tomahawksettings.cpp
View File

@@ -100,13 +100,17 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
// not pretty as we hardcode a plugin id and assume that we know how the config layout is, but hey, this is migration after all // not pretty as we hardcode a plugin id and assume that we know how the config layout is, but hey, this is migration after all
if( contains( "jabber/username" ) && contains( "jabber/password" ) ) if( contains( "jabber/username" ) && contains( "jabber/password" ) )
{ {
setValue( "sipjabber_legacy/username", value( "jabber/username" ) ); QString sipName = "sipjabber";
setValue( "sipjabber_legacy/password", value( "jabber/password" ) ); if( value( "jabber/username" ).toString().contains( "@gmail" ) )
setValue( "sipjabber_legacy/autoconnect", value( "jabber/autoconnect" ) ); sipName = "sipgoogle";
setValue( "sipjabber_legacy/port", value( "jabber/port" ) );
setValue( "sipjabber_legacy/server", value( "jabber/server" ) );
addSipPlugin( "sipjabber_legacy" ); setValue( QString( "%1_legacy/username" ).arg( sipName ), value( "jabber/username" ) );
setValue( QString( "%1_legacy/password" ).arg( sipName ), value( "jabber/password" ) );
setValue( QString( "%1r_legacy/autoconnect" ).arg( sipName ), value( "jabber/autoconnect" ) );
setValue( QString( "%1_legacy/port" ).arg( sipName ), value( "jabber/port" ) );
setValue( QString( "%1_legacy/server" ).arg( sipName ), value( "jabber/server" ) );
addSipPlugin( QString( "%1_legacy" ).arg( sipName ) );
remove( "jabber/username" ); remove( "jabber/username" );
remove( "jabber/password" ); remove( "jabber/password" );

8
src/sip/twitter/twitter.cpp
View File

@@ -181,16 +181,16 @@ TwitterPlugin::refreshTwitterAuth()
qDebug() << Q_FUNC_INFO << " begin"; qDebug() << Q_FUNC_INFO << " begin";
if( !m_twitterAuth.isNull() ) if( !m_twitterAuth.isNull() )
delete m_twitterAuth.data(); delete m_twitterAuth.data();
Q_ASSERT( TomahawkUtils::nam() != 0 ); Q_ASSERT( TomahawkUtils::nam() != 0 );
qDebug() << Q_FUNC_INFO << " with nam " << TomahawkUtils::nam(); qDebug() << Q_FUNC_INFO << " with nam " << TomahawkUtils::nam();
m_twitterAuth = QWeakPointer<TomahawkOAuthTwitter>( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) ); m_twitterAuth = QWeakPointer<TomahawkOAuthTwitter>( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
if( m_twitterAuth.isNull() ) if( m_twitterAuth.isNull() )
return false; return false;
m_twitterAuth.data()->setOAuthToken( settings->twitterOAuthToken().toLatin1() ); m_twitterAuth.data()->setOAuthToken( twitterOAuthToken().toLatin1() );
m_twitterAuth.data()->setOAuthTokenSecret( settings->twitterOAuthTokenSecret().toLatin1() ); m_twitterAuth.data()->setOAuthTokenSecret( twitterOAuthTokenSecret().toLatin1() );
return true; return true;
} }

4
src/sip/twitter/twitterconfigwidget.cpp
View File

@@ -203,8 +203,8 @@ TwitterConfigWidget::startPostGotTomahawkStatus()
return; return;
} }
TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ); TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
twitAuth->setOAuthToken( s->twitterOAuthToken().toLatin1() ); twitAuth->setOAuthToken( m_plugin->twitterOAuthToken().toLatin1() );
twitAuth->setOAuthTokenSecret( s->twitterOAuthTokenSecret().toLatin1() ); twitAuth->setOAuthTokenSecret( m_plugin->twitterOAuthTokenSecret().toLatin1() );
QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this ); QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this );
connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( postGotTomahawkStatusAuthVerifyReply(const QTweetUser &) ) ); connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( postGotTomahawkStatusAuthVerifyReply(const QTweetUser &) ) );
credVerifier->verify(); credVerifier->verify();