From f5b0c352746176f1fc87dcbae33dff897a26a452 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Wed, 7 Sep 2011 06:12:07 +0200
Subject: [PATCH] Share one trayIcon across all windows

---
 src/tomahawkwindow.cpp | 7 +++++--
 src/tomahawkwindow.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index aaebc6c4e..bf5e31a66 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -32,10 +32,10 @@
 using namespace Tomahawk;
 
 SourcesModel* TomahawkWindow::s_sourcesModel = 0;
+TomahawkTrayIcon* TomahawkWindow::s_trayIcon = 0;
 
 TomahawkWindow::TomahawkWindow( QWidget* parent )
     : QMainWindow( parent )
-    , m_trayIcon( new TomahawkTrayIcon( this ) )
 {
     setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
 
@@ -45,6 +45,9 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     if( !s_sourcesModel )
         s_sourcesModel = new SourcesModel( this );
 
+    if( !s_trayIcon )
+        s_trayIcon = new TomahawkTrayIcon( this );
+
     setupSignals();
 }
 
@@ -127,7 +130,7 @@ TomahawkWindow::closeEvent( QCloseEvent* e )
         return;
     }
 #else
-    m_trayIcon->setShowHideWindow( false );
+    s_trayIcon->setShowHideWindow( false );
 #endif
 
     e->accept();
diff --git a/src/tomahawkwindow.h b/src/tomahawkwindow.h
index 693395d4e..1b09aa43c 100644
--- a/src/tomahawkwindow.h
+++ b/src/tomahawkwindow.h
@@ -59,9 +59,9 @@ private:
 
 protected:
     static SourcesModel* s_sourcesModel;
+    static TomahawkTrayIcon* s_trayIcon;
 
     QString m_windowTitle;
-    TomahawkTrayIcon* m_trayIcon;
     Tomahawk::result_ptr m_currentTrack;
 };