From 18e6c0a1975b2b60d958a16c89596ea7ef1648c1 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 22 Jun 2013 12:32:02 +0200
Subject: [PATCH] * Changed tomahawkLoaded handling.

---
 src/tomahawk/TomahawkApp.cpp | 16 ++++------------
 src/tomahawk/TomahawkApp.h   |  4 +---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp
index 3aaa75e14..bcaecb386 100644
--- a/src/tomahawk/TomahawkApp.cpp
+++ b/src/tomahawk/TomahawkApp.cpp
@@ -146,7 +146,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     , m_mainwindow( 0 )
 #endif
     , m_headless( false )
-    , m_loaded( false )
 {
     if ( arguments().contains( "--help" ) || arguments().contains( "-h" ) )
     {
@@ -158,7 +157,6 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
     setOrganizationDomain( QLatin1String( TOMAHAWK_ORGANIZATION_DOMAIN ) );
     setApplicationName( QLatin1String( TOMAHAWK_APPLICATION_NAME ) );
     setApplicationVersion( QLatin1String( TOMAHAWK_VERSION ) );
-    connect( this, SIGNAL( tomahawkLoaded() ), SLOT( initEnergyEventHandler() ) );
 
     registerMetaTypes();
     TomahawkUtils::installTranslator( this );
@@ -566,6 +564,7 @@ TomahawkApp::initFactoriesForAccountManager()
     Tomahawk::Accounts::AccountManager::instance()->loadFromConfig();
 }
 
+
 void
 TomahawkApp::initEnergyEventHandler()
 {
@@ -590,9 +589,6 @@ TomahawkApp::initSIP()
         tDebug( LOGINFO ) << "Connecting SIP classes";
         Accounts::AccountManager::instance()->initSIP();
     }
-
-    m_loaded = true;
-    emit tomahawkLoaded();
 }
 
 
@@ -684,6 +680,9 @@ TomahawkApp::onInfoSystemReady()
     // Make sure to do this after main window is inited
     Tomahawk::enableFullscreen( m_mainwindow );
 #endif
+
+    initEnergyEventHandler();
+    emit tomahawkLoaded();
 }
 
 
@@ -812,10 +811,3 @@ TomahawkApp::mainWindow() const
 {
     return m_mainwindow;
 }
-
-
-bool
-TomahawkApp::isTomahawkLoaded() const
-{
-    return m_loaded;
-}
diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h
index 952ebfe5b..3286e58f7 100644
--- a/src/tomahawk/TomahawkApp.h
+++ b/src/tomahawk/TomahawkApp.h
@@ -95,8 +95,6 @@ public:
     // PlatformInterface
     virtual bool loadUrl( const QString& url );
 
-    bool isTomahawkLoaded() const;
-
     // reimplemented from QApplication/QCoreApplication
     virtual bool notify( QObject* receiver, QEvent* e );
 
@@ -144,7 +142,7 @@ private:
     TomahawkWindow* m_mainwindow;
 #endif
 
-    bool m_headless, m_loaded;
+    bool m_headless;
 
     QPointer< QxtHttpServerConnector > m_connector;
     QPointer< QxtHttpSessionManager > m_session;