Merge pull request #219 from TheOneRing/no-thumb-test

No thumb test

src/libtomahawk/CMakeLists.txt

@@ -434,16 +434,6 @@ IF(LIBATTICA_FOUND)
 ENDIF(LIBATTICA_FOUND)
 
 IF( WIN32 )
-	# Check for the availability of the Thumbbutton
-
-	check_cxx_source_compiles( "
-     #include <shobjidl.h>
-     int main() {
-         THUMBBUTTON foo;
-         return 0;
-     }
-     "
-     HAVE_THUMBBUTTON )
     SET( OS_SPECIFIC_LINK_LIBRARIES
         ${OS_SPECIFIC_LINK_LIBRARIES}
     # System

src/tomahawk/Config.h.in

@@ -10,7 +10,6 @@
 #cmakedefine SNOW_LEOPARD
 #cmakedefine LEOPARD
 #cmakedefine HAVE_SPARKLE
-#cmakedefine HAVE_THUMBBUTTON
 
 #cmakedefine WITH_BREAKPAD
 #cmakedefine WITH_CRASHREPORTER

src/tomahawk/TomahawkWindow.cpp

@@ -104,9 +104,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     , TomahawkUtils::DpiScaler( this )
 #ifdef Q_OS_WIN
     , m_buttonCreatedID( RegisterWindowMessage( L"TaskbarButtonCreated" ) )
-  #ifdef HAVE_THUMBBUTTON
     , m_taskbarList( 0 )
-  #endif
 #endif
     , ui( new Ui::TomahawkWindow )
     , m_searchWidget( 0 )
@@ -509,7 +507,6 @@ TomahawkWindow::setupUpdateCheck()
 bool
 TomahawkWindow::setupWindowsButtons()
 {
-#ifdef HAVE_THUMBBUTTON
     const GUID IID_ITaskbarList3 = { 0xea1afb91,0x9e28,0x4b86, { 0x90,0xe9,0x9e,0x9f,0x8a,0x5e,0xef,0xaf } };
     HRESULT hr = S_OK;
 
@@ -559,9 +556,6 @@ TomahawkWindow::setupWindowsButtons()
     }
 
     return SUCCEEDED( hr );
-#else // HAVE_THUMBBUTTON
-    return false;
-#endif
 }
 
 
@@ -788,7 +782,6 @@ void
 TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState )
 {
     Q_UNUSED(oldState);
-#ifdef HAVE_THUMBBUTTON
     if ( m_taskbarList == 0 )
         return;
     switch ( newState )
@@ -829,17 +822,12 @@ TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState )
     }
 
     m_taskbarList->ThumbBarUpdateButtons( winId(), ARRAYSIZE( m_thumbButtons ), m_thumbButtons );
-#else
-    Q_UNUSED( newState );
-    Q_UNUSED( oldState );
-#endif // HAVE_THUMBBUTTON
 }
 
 
 void
 TomahawkWindow::updateWindowsLoveButton()
 {
-#ifdef HAVE_THUMBBUTTON
     if ( m_taskbarList == 0 )
         return;
     if ( !AudioEngine::instance()->currentTrack().isNull() && AudioEngine::instance()->currentTrack()->track()->loved() )
@@ -855,7 +843,6 @@ TomahawkWindow::updateWindowsLoveButton()
 
     m_thumbButtons[TP_LOVE].dwFlags = THBF_ENABLED;
     m_taskbarList->ThumbBarUpdateButtons( winId(), ARRAYSIZE( m_thumbButtons ), m_thumbButtons );
-#endif // HAVE_THUMBBUTTON
 }
 
 

src/tomahawk/TomahawkWindow.h

@@ -162,10 +162,8 @@ private:
     bool setupWindowsButtons();
     const unsigned int m_buttonCreatedID;
     HICON thumbIcon(TomahawkUtils::ImageType type);
-  #ifdef HAVE_THUMBBUTTON
     ITaskbarList3* m_taskbarList;
     THUMBBUTTON m_thumbButtons[5];
-  #endif
     enum TB_STATES{ TP_PREVIOUS = 0,TP_PLAY_PAUSE = 1,TP_NEXT = 2,TP_LOVE = 4 };
 #endif