From af0504fe41f368674823cc7340239c71e9b98c61 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 29 May 2013 00:26:51 +0200 Subject: [PATCH] Bump Version to 0.7.999 --- CMakeLists.txt | 2 +- src/libtomahawk/network/ConnectionManager.cpp | 6 +++--- src/libtomahawk/network/Servent.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f74590f5a..c71cbe0cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ ENDIF() SET( TOMAHAWK_VERSION_MAJOR 0 ) SET( TOMAHAWK_VERSION_MINOR 7 ) -SET( TOMAHAWK_VERSION_PATCH 99 ) +SET( TOMAHAWK_VERSION_PATCH 999 ) #SET( TOMAHAWK_VERSION_RC 0 ) SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ru sv tr zh_CN zh_TW ) diff --git a/src/libtomahawk/network/ConnectionManager.cpp b/src/libtomahawk/network/ConnectionManager.cpp index b13437c56..234e41869 100644 --- a/src/libtomahawk/network/ConnectionManager.cpp +++ b/src/libtomahawk/network/ConnectionManager.cpp @@ -45,11 +45,11 @@ void ConnectionManager::handleSipInfoPrivate( const Tomahawk::peerinfo_ptr &peerInfo ) { m_mutex.lock(); - // Respect different behaviour before 0.7.99 + // Respect different behaviour before 0.7.999 peerInfoDebug( peerInfo ) << Q_FUNC_INFO << "Trying to connect to client with version " << peerInfo->versionString().split(' ').last() << TomahawkUtils::compareVersionStrings( peerInfo->versionString().split(' ').last(), "0.7.99" ); - if ( !peerInfo->versionString().isEmpty() && TomahawkUtils::compareVersionStrings( peerInfo->versionString().split(' ').last(), "0.7.99" ) < 0) + if ( !peerInfo->versionString().isEmpty() && TomahawkUtils::compareVersionStrings( peerInfo->versionString().split(' ').last(), "0.7.999" ) < 0) { - peerInfoDebug( peerInfo ) << Q_FUNC_INFO << "Using old-style (<0.7.99) connection order."; + peerInfoDebug( peerInfo ) << Q_FUNC_INFO << "Using old-style (<0.7.999) connection order."; SipInfo we = Servent::getSipInfoForOldVersions( Servent::instance()->getLocalSipInfos( QString( "default" ), QString( "default" ) ) ); SipInfo they = peerInfo->sipInfos().first(); if ( they.isVisible() ) diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index 69c97bc06..3284e88e1 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -487,7 +487,7 @@ Servent::registerPeer( const Tomahawk::peerinfo_ptr& peerInfo ) // The offer should be removed after some time or we will build up a heap of unused PeerInfos registerLazyOffer( key, peerInfo, nodeid, sipInfos.length() * 1.5 * CONNECT_TIMEOUT ); // SipInfos were single-value before 0.7.999 - if ( !peerInfo->versionString().isEmpty() && TomahawkUtils::compareVersionStrings( peerInfo->versionString().split(' ').last(), "0.7.99" ) < 0) + if ( !peerInfo->versionString().isEmpty() && TomahawkUtils::compareVersionStrings( peerInfo->versionString().split(' ').last(), "0.7.999" ) < 0) { SipInfo info = getSipInfoForOldVersions( sipInfos ); peerInfo->sendLocalSipInfos( QList() << info );