mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-08 21:20:45 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin/master' into liblastfm2

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-25 09:40:56 -04:00
parent b7a1cb8d99 4f77de3bbc
commit 6b1bb4da61
12 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@@ -138,11 +138,10 @@ INCLUDE_DIRECTORIES(
${THIRDPARTY_DIR}/alsa-playback
${THIRDPARTY_DIR}/rtaudio
${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb/
${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb
${THIRDPARTY_DIR}/qtweetlib/qtweetlib/src
${THIRDPARTY_DIR}/qtweetlib/tomahawk-custom
${TAGLIB_INCLUDES}
${QJSON_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR}
@@ -169,6 +168,7 @@ IF( APPLE )
ENDIF( APPLE )
IF(GLOOX_FOUND)
INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} )
SET( tomahawkHeaders ${tomahawkHeaders} xmppbot/xmppbot.h )
SET( tomahawkSources ${tomahawkSources} xmppbot/xmppbot.cpp )
ENDIF(GLOOX_FOUND)

1
src/libtomahawk/widgets/welcomewidget.cpp
View File

@@ -41,6 +41,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
ui->setupUi( this );
ui->playlistWidget->setItemDelegate( new PlaylistDelegate() );
ui->playlistWidget->overlay()->resize( 380, 86 );
ui->tracksView->overlay()->setEnabled( false );
m_tracksModel = new PlaylistModel( ui->tracksView );

2
src/sip/jabber/jabber_p.cpp
View File

@@ -158,7 +158,7 @@ Jabber_p::go()
m_client->disco()->addFeature( "tomahawk:player" );
*/
m_client->setPresence( Presence::Available, 1, "Tomahawk available" );
m_client->setPresence( Presence::XA, -127, "Tomahawk available" );
// m_client->connect();
// return;