diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..c07550f06
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,16 @@
+Tomahawk is primarily authored by:
+
+* Christian Muehlhaeuser <muesli@tomahawk-player.org>
+
+Contributors include:
+
+* Leo Franchi <lfranchi@kde.org>
+* Dominik Schmidt <dev@dominik-schmidt.de>
+* Jeff Mitchell <mitchell@kde.org>
+* J Herskowitz <jherskow@gmail.com>
+* Alejandro Wainzinger <aikawarazuni@gmail.com>
+
+Thanks to:
+
+* Harald Sitter <sitter@kde.org>
+* Steve Robertson
diff --git a/ChangeLog b/ChangeLog
index ac67013ec..e2d364e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,2 @@
Version 0.0.1:
- Features:
- * Knocks your socks off
+ * First public release.
diff --git a/admin/mac/sparkle-beta.rss b/admin/mac/sparkle-beta.rss
index 604fd8dd8..0a38d7ee5 100755
--- a/admin/mac/sparkle-beta.rss
+++ b/admin/mac/sparkle-beta.rss
@@ -11,7 +11,7 @@
https://github.com/tomahawk-player/tomahawk/raw/master/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
- <enclosure url="http://download.tomahawk-player.org/sparkle-debug/updates/tomahawk0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
+ <enclosure url="http://download.tomahawk-player.org/sparkle-debug/updates/tomahawk-beta-0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
</item>
</channel>
</rss>
diff --git a/admin/win/Toolchain-mingw32-openSUSE.cmake b/admin/win/Toolchain-mingw32-openSUSE.cmake
index ceb2ce9be..80a22964d 100644
--- a/admin/win/Toolchain-mingw32-openSUSE.cmake
+++ b/admin/win/Toolchain-mingw32-openSUSE.cmake
@@ -17,3 +17,4 @@ SET(WINDRES_EXECUTABLE /usr/bin/i686-w64-mingw32-windres)
# libs with broken find modules
SET(TAGLIB_FOUND true)
SET(TAGLIB_LIBRARIES ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
+SET(TAGLIB_INCLUDES ${CMAKE_FIND_ROOT_PATH}/include/taglib)
diff --git a/admin/win/nsi/revision.txt b/admin/win/nsi/revision.txt
index 615be700b..bd753ccc4 100644
--- a/admin/win/nsi/revision.txt
+++ b/admin/win/nsi/revision.txt
@@ -1 +1 @@
-85
\ No newline at end of file
+94
\ No newline at end of file
diff --git a/admin/win/nsi/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi
index 8844276c9..d2681ef8d 100755
--- a/admin/win/nsi/tomahawk.nsi
+++ b/admin/win/nsi/tomahawk.nsi
@@ -23,6 +23,7 @@
!define BUILD_PATH "${ROOT_PATH}\build"
!define QT_DLL_PATH "${MING_BIN}"
!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
+!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
;-----------------------------------------------------------------------------
; Increment installer revision number as part of this script.
@@ -292,6 +293,12 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
SetOutPath "$INSTDIR\sqldrivers"
File "${SQLITE_DLL_PATH}\qsqlite4.dll"
SetOutPath "$INSTDIR"
+
+ ;Image plugins
+ SetOutPath "$INSTDIR\imageformats"
+ File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
+ File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
+ SetOutPath "$INSTDIR"
;Cygwin/c++ stuff
;File "${MING_DLL_PATH}\cygmad-0.dll"
@@ -313,6 +320,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${MING_DLL_PATH}\libtag.dll"
File "${MING_DLL_PATH}\libgloox-8.dll"
File "${MING_DLL_PATH}\libpng15-15.dll"
+ File "${MING_DLL_PATH}\libjpeg-8.dll"
File "${MING_DLL_PATH}\zlib1.dll"
File "${MING_DLL_PATH}\libechonest.dll"
diff --git a/admin/win/sparklewin-beta.rss b/admin/win/sparklewin-beta.rss
index 52e9d0302..9d1f276cc 100644
--- a/admin/win/sparklewin-beta.rss
+++ b/admin/win/sparklewin-beta.rss
@@ -11,7 +11,7 @@
https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
- <enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk0.0.1.exe" sparkle:version="0.0.1" />
+ <enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" />
</item>
</channel>
</rss>
diff --git a/admin/win/sparklewin.rss b/admin/win/sparklewin.rss
index 52e9d0302..cec8b11c6 100644
--- a/admin/win/sparklewin.rss
+++ b/admin/win/sparklewin.rss
@@ -11,7 +11,7 @@
https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
- <enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk0.0.1.exe" sparkle:version="0.0.1" />
+ <enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk-0.0.1.exe" sparkle:version="0.0.1" />
</item>
</channel>
</rss>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3d50b2cc..20b2eb693 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index d736aa2dc..cc4460895 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -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 );
diff --git a/src/sip/jabber/jabber_p.cpp b/src/sip/jabber/jabber_p.cpp
index d4cbe801c..aafd29543 100644
--- a/src/sip/jabber/jabber_p.cpp
+++ b/src/sip/jabber/jabber_p.cpp
@@ -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;
diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt
index c6b21831d..f3beb6c46 100644
--- a/thirdparty/qtweetlib/CMakeLists.txt
+++ b/thirdparty/qtweetlib/CMakeLists.txt
@@ -181,6 +181,7 @@ endif(APPLE)
target_link_libraries(tomahawk_qtweetlib
${QT_LIBRARIES}
${QJSON_FLAGS}
+ ${QJSON_LIBRARIES}
)
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )