From d1a98b5367c4c42a0b96362647558bd2bb3b2c3e Mon Sep 17 00:00:00 2001
From: Thomas Frauendorfer <Thomas.Frauendorfer@googlemail.com>
Date: Mon, 9 Jun 2008 03:12:51 +0200
Subject: [PATCH] Fix bug when used together with metacity

The playlist and equalizer windows where hidden when switching to
another desktop
---
 src/mainwindow/maindisplay.cpp |  4 ++--
 src/playlist/playlistview.cpp  | 15 +--------------
 src/playlist/playlistview.h    |  3 ---
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp
index ae25383..c414b33 100644
--- a/src/mainwindow/maindisplay.cpp
+++ b/src/mainwindow/maindisplay.cpp
@@ -259,7 +259,7 @@ MainDisplay::SetupToggleButtons (void)
 	m_eq->resize (skin->getSize (Skin::BUTTON_MW_EQ));
 	m_eq->move (skin->getPos (Skin::BUTTON_MW_EQ));
 	m_eq->setChecked (m_mw->getEQ ()->isVisible ());
-	connect (m_eq, SIGNAL (toggled (bool)),
+	connect (m_eq, SIGNAL (clicked (bool)),
 	         m_mw->getEQ (), SLOT (setVisible (bool)));
 	connect (m_mw->getEQ (), SIGNAL (visibilityChanged (bool)),
 	         m_eq, SLOT (setChecked (bool)));
@@ -269,7 +269,7 @@ MainDisplay::SetupToggleButtons (void)
 	m_pls->resize (skin->getSize (Skin::BUTTON_MW_PLS));
 	m_pls->move (skin->getPos (Skin::BUTTON_MW_PLS));
 	m_pls->setChecked (m_mw->getPL ()->isVisible ());
-	connect (m_pls, SIGNAL (toggled (bool)),
+	connect (m_pls, SIGNAL (clicked (bool)),
 	         m_mw->getPL (), SLOT (setVisible (bool)));
 	connect (m_mw->getPL (), SIGNAL (visibilityChanged (bool)),
 	         m_pls, SLOT (setChecked (bool)));
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 7fc99cf..93a26aa 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -142,9 +142,6 @@ PlaylistView::PlaylistView (QWidget *parent) : QListView (parent)
 
 	connect (xmmsh.xplayback (), SIGNAL(playbackStatusChanged(Xmms::Playback::Status)),
 	         this, SLOT(handleStatus(Xmms::Playback::Status)));
-
-	connect (this, SIGNAL (clicked (QModelIndex)),
-	         this, SLOT (on_item_clicked (QModelIndex)));
 }
 
 void
@@ -200,7 +197,7 @@ PlaylistView::contextMenuEvent (QContextMenuEvent *e)
 
 	qm.addSeparator ();
 
-	a= new QAction (tr ("Change Playlist"), this);
+	a= new QAction (tr ("Choose Playlist"), this);
 	connect (a, SIGNAL (triggered ()), qobject_cast<PlaylistWidget *>(parent ()), SLOT (openPlaylistChooser ()));
 	qm.addAction (a);
 
@@ -306,13 +303,3 @@ PlaylistView::showEntryInfo (void)
 		m_entry_info->show ();
 	}
 }
-
-void
-PlaylistView::on_item_clicked (QModelIndex index)
-{
-	if (m_entry_info) {
-		uint32_t id = model ()->data (index, PlaylistModel::MedialibIdRole)
-		                        .toUInt ();
-		m_entry_info->setId (id);
-	}
-}
diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h
index 7114ed8..9a1c0cf 100644
--- a/src/playlist/playlistview.h
+++ b/src/playlist/playlistview.h
@@ -66,9 +66,6 @@ class PlaylistView : public QListView {
 	protected:
 		void mouseDoubleClickEvent (QMouseEvent *event);
 
-	private slots:
-		void on_item_clicked (QModelIndex index);
-
 	private:
 		Xmms::Playback::Status m_status;
 		QFont *m_font;