From: thedoc <thedoc@atom.(none)>
Date: Fri, 11 Dec 2009 12:24:50 +0000 (+0100)
Subject: Merge branch 'fantempplugin' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=6f1e7dff0f9ee7f56d48d3597d45d581057d6ce7;hp=28dcf6be0ee22fedd728fef11ccff484f8a851e8

Merge branch 'fantempplugin' into experimental
---

diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
index 5dfacd8..01c276a 100644
--- a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
@@ -146,10 +146,16 @@ class TempFanControl(Screen, ConfigListScreen):
 		fancontrol.getConfig(0).vlt.load()
 		fancontrol.getConfig(0).pwm.load()
 		self.close()
-
+		
 def main(session, **kwargs):
 	session.open(TempFanControl)
 
+def startMenu(menuid):
+	if menuid != "system":
+		return []
+	
+	return [(_("Temperature and Fan control"), main, "tempfancontrol", 80)]
+
 def Plugins(**kwargs):
-	return PluginDescriptor(name = "Temperature and Fan control", description = _("Temperature and Fan control"), where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main)
+	return PluginDescriptor(name = "Temperature and Fan control", description = _("Temperature and Fan control"), where = PluginDescriptor.WHERE_MENU, fnc = startMenu)
 	
\ No newline at end of file