Merge branch 'master' of github.com:lastfm/lastfm-desktop

lastfm · Jan 22, 2013 · 4e5151b · 4e5151b
2 parents 24d4a63 + ca7c6ea
commit 4e5151b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/app/client/MainWindow.cpp b/app/client/MainWindow.cpp
@@ -415,8 +415,10 @@ MainWindow::onDiagnosticsTriggered()
 void
 MainWindow::setBetaUpdates( bool betaUpdates )
 {
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     if ( m_updater )
         m_updater->setBetaUpdates( betaUpdates );
+#endif
 }
 
 void

diff --git a/app/client/Widgets/NothingPlayingWidget.cpp b/app/client/Widgets/NothingPlayingWidget.cpp
@@ -79,7 +79,7 @@ NothingPlayingWidget::onSessionChanged( const unicorn::Session& session )
     }
 }
 
-#ifndef Q_OS_MAC
+#ifdef Q_OS_WIN
 void
 NothingPlayingWidget::startApp( const QString& app )
 {

diff --git a/app/client/Widgets/NothingPlayingWidget.h b/app/client/Widgets/NothingPlayingWidget.h
@@ -23,7 +23,9 @@ class NothingPlayingWidget : public QFrame
 private slots:
     void onSessionChanged( const unicorn::Session& session );
 
+#if defined( Q_OS_MAC ) || defined( Q_OS_WIN )
     void oniTunesClicked();
+#endif
 #ifdef Q_OS_WIN
     void onWinampClicked();
     void onWMPClicked();