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

Merge branch 'stable'

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Jeff Mitchell
2011-03-27 18:55:49 -04:00
parent 250202a095 63550ce712
commit 96b4fbccc6
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,4 +1,6 @@
Version 0.0.2: Version 0.0.2:
* Don't let long playlist or summary names force a large Tomahawk window.
* Fixed Jabber auth: Freshly added contacts never showed up. * Fixed Jabber auth: Freshly added contacts never showed up.
Version 0.0.1: Version 0.0.1:
* First public release. * First public release.

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

@@ -168,6 +168,7 @@ TwitterPlugin::disconnectPlugin()
m_twitterAuth.data()->deleteLater(); m_twitterAuth.data()->deleteLater();
m_cachedPeers.empty(); m_cachedPeers.empty();
m_attemptedConnects.empty();
delete m_twitterAuth.data(); delete m_twitterAuth.data();
m_isOnline = false; m_isOnline = false;
} }
@@ -583,14 +584,16 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
qDebug() << "TwitterPlugin did not send offer because external address is " << Servent::instance()->externalAddress() << " and external port is " << Servent::instance()->externalPort(); qDebug() << "TwitterPlugin did not send offer because external address is " << Servent::instance()->externalAddress() << " and external port is " << Servent::instance()->externalPort();
} }
if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&_peerData ) );
if ( peersChanged ) if ( peersChanged )
{ {
m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData ); m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData );
TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers ); TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
m_attemptedConnects[screenName] = false;
} }
if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&_peerData ) );
} }
void void
@@ -611,6 +614,11 @@ void
TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData ) TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
if ( m_attemptedConnects.contains( screenName ) && m_attemptedConnects[screenName] )
{
qDebug() << "Already attempted to connect to this peer with no change in their status, not trying again for now";
return;
}
if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) ) if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) )
{ {
qDebug() << "TwitterPlugin could not find host and/or port and/or pkey for peer " << screenName; qDebug() << "TwitterPlugin could not find host and/or port and/or pkey for peer " << screenName;
@@ -623,6 +631,7 @@ TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString,
peerData["pkey"].toString(), peerData["pkey"].toString(),
friendlyName, friendlyName,
peerData["node"].toString() ); peerData["node"].toString() );
m_attemptedConnects[screenName] = true;
} }
void void

1
src/sip/twitter/twitter.h
View File

@@ -108,6 +108,7 @@ private:
qint64 m_cachedMentionsSinceId; qint64 m_cachedMentionsSinceId;
qint64 m_cachedDirectMessagesSinceId; qint64 m_cachedDirectMessagesSinceId;
QHash< QString, QVariant > m_cachedPeers; QHash< QString, QVariant > m_cachedPeers;
QHash< QString, bool > m_attemptedConnects;
QSet<QString> m_keyCache; QSet<QString> m_keyCache;
bool m_finishedFriends; bool m_finishedFriends;
bool m_finishedMentions; bool m_finishedMentions;