From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 31 Mar 2010 08:41:40 +0000 (+0200)
Subject: Merge commit 'origin/bug_494_disable_automatic_ipkgupdate'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=0b29614d57e24f5217e052998808c05ac841e353;hp=da4675887fff4d24cc775b42a25a10162f117ad7

Merge commit 'origin/bug_494_disable_automatic_ipkgupdate'
---

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index 4dbe7f7..4917855 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -420,7 +420,7 @@ class PluginManager(Screen, DreamInfoHandler):
 
 	def getUpdateInfos(self):
 		self.setState('update')
-		iSoftwareTools.getUpdates(self.getUpdateInfosCB)
+		iSoftwareTools.startSoftwareTools(self.getUpdateInfosCB)
 
 	def getUpdateInfosCB(self, retval = None):
 		if retval is not None:
@@ -429,9 +429,10 @@ class PluginManager(Screen, DreamInfoHandler):
 					self["status"].setText(_("There are at least ") + str(iSoftwareTools.available_updates) + _(" updates available."))
 				else:
 					self["status"].setText(_("There are no updates available."))
+				self.rebuildList()
 			elif retval is False:
+				self.setState('error')
 				self["status"].setText(_("No network connection available."))
-			self.rebuildList()
 
 	def rebuildList(self, retval = None):
 		if self.currentSelectedTag is None:
@@ -1701,15 +1702,11 @@ def startSetup(menuid):
 		return [ ]
 	return [(_("Software management"), UpgradeMain, "software_manager", 50)]
 
-def autostart(reason, **kwargs):
-	if reason is True:
-		iSoftwareTools.startSoftwareTools()
 
 def Plugins(path, **kwargs):
 	global plugin_path
 	plugin_path = path
 	list = [
-		PluginDescriptor(where = [PluginDescriptor.WHERE_NETWORKCONFIG_READ], fnc = autostart),
 		PluginDescriptor(name=_("Software management"), description=_("Manage your receiver's software"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup),
 		PluginDescriptor(name=_("Ipkg"), where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan)
 	]