Updated Kaffeine to latest upstream version

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kaffeine@1182813 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 19 deletions

diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 1aa2d79..4411f27 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -158,14 +158,13 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true);
 	//statusBar()->insertItem(i18n("No player"), 10, 0, true);
 
- 	QString stamp =  locate("appdata", "wizard_stamp_v0.7.1");
- 	QString localStamp =  locateLocal("appdata", "wizard_stamp_v0.7.1");
+	QString stamp =  locateLocal("appdata", "wizard_stamp_v0.7.1");
 	if ((!QFile::exists(stamp)) || args->isSet("wizard"))
 	{
 		InstWizard::showWizard();
 
 		KProcess process;
- 		process << "touch" << localStamp;
+		process << "touch" << stamp;
 		process.start(KProcess::Block, KProcess::Stderr);
 		process.clearArguments();
 	}
@@ -308,8 +307,10 @@ void Kaffeine::updateArgs()
 	}
 	loadTMP(urls);
 
-	if (args->isSet("fullscreen"))
+	if (args->isSet("fullscreen")) {
+		inplug->showPlayer();
 		fullscreen();
+	}
 
 	if (args->isSet("minimal"))
 		minimal();
@@ -360,7 +361,7 @@ void Kaffeine::slotLoadPart(const QString& desktopName)
 {
 	kdDebug() << "Kaffeine:: Try to load service: " << desktopName << endl;
 
-	if (desktopName == m_currentPartService && m_mediaPart != NULL)
+	if (desktopName == m_currentPartService)
 		return;
 
 	KService::Ptr service = KService::serviceByDesktopName(desktopName);
@@ -443,7 +444,6 @@ void Kaffeine::slotLoadPart(const QString& desktopName)
 		}
 	}
 	inplug->setPlayerContainer( m_playerContainer );
-	m_playerContainer->show();
 }
 
 void Kaffeine::slotLoadingCanceled(const QString& message)
@@ -694,7 +694,7 @@ void Kaffeine::setupActions()
 	QStringList mediaParts;
 
 	// check for kaffeine parts
-	KTrader::OfferList offers = KTrader::self()->query("application/x-mplayer2", "'KaffeinePart' in ServiceTypes");
+	KTrader::OfferList offers = KTrader::self()->query("audio/x-mp3", "'KaffeinePart' in ServiceTypes");
 	KTrader::OfferList::Iterator end(offers.end());
 	for(KTrader::OfferList::Iterator it = offers.begin(); it != end; ++it)
 	{
@@ -1899,15 +1899,3 @@ int Kaffeine::dvbSNR( int device )
 #endif
 	return -1;
 }
-
-void Kaffeine::reloadEngine()
-{
-	bool isPlaying = m_mediaPart ? m_mediaPart->isPlaying() : false;
-
-	unloadCurrentPart();
-	kapp->config()->setGroup("Player Part");
-	slotLoadPart(kapp->config()->readEntry("Last Service Desktop Name", DEFAULT_PLAYER_PART));
-
-	if (isPlaying)
-		slotPlaylistPlay();
-}