3 files changed, 17 insertions, 1 deletions
diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index d19386b2..10423ada 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -6,7 +6,9 @@ from Components.Label import Label
 from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN
 from Components.ConfigList import ConfigList
 
-from enigma import eTimer, eDVBCI_UI
+from Components.SystemInfo import SystemInfo
+
+from enigma import eTimer, eDVBCI_UI, eDVBCIInterfaces
 
 MAX_NUM_CI = 4
 
@@ -224,6 +226,7 @@ class CiMessageHandler:
 		self.ci = { }
 		self.dlgs = { }
 		eDVBCI_UI.getInstance().ciStateChanged.get().append(self.ciStateChanged)
+		SystemInfo["CommonInterface"]= eDVBCIInterfaces.getInstance().getNumOfSlots() > 0
 
 	def setSession(self, session):
 		self.session = session
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 7c084d45..ce7f2ea6 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -5,6 +5,7 @@ from Components.Sources.StaticText import StaticText
 from Components.config import configfile
 from Components.PluginComponent import plugins
 from Components.config import config
+from Components.SystemInfo import SystemInfo
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
@@ -102,6 +103,9 @@ class Menu(Screen):
 		self.session.openWithCallback(self.menuClosed, Setup, dialog)
 
 	def addMenu(self, destList, node):
+		requires = node.getAttribute("requires")
+		if requires and not SystemInfo.get(requires, False):
+			return
 		MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
 		entryID = node.getAttribute("entryID") or "undefined"
 		weight = node.getAttribute("weight") or 50
@@ -122,6 +126,9 @@ class Menu(Screen):
 			self.close(True)
 
 	def addItem(self, destList, node):
+		requires = node.getAttribute("requires")
+		if requires and not SystemInfo.get(requires, False):
+			return
 		item_text = node.getAttribute("text").encode("UTF-8")
 		entryID = node.getAttribute("entryID") or "undefined"
 		weight = node.getAttribute("weight") or 50
@@ -173,6 +180,7 @@ class Menu(Screen):
 			    continue
 			elif x.tagName == 'item':
 				item_level = int(x.getAttribute("level") or "0")
+				
 				if item_level <= config.usage.setup_level.index:
 					self.addItem(list, x)
 					count += 1
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index f7b4fa58..f352e8cb 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,6 +1,7 @@
 from Screen import Screen
 from Components.ActionMap import NumberActionMap
 from Components.config import config, ConfigNothing
+from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
 from Components.Label import Label
 from Components.Pixmap import Pixmap
@@ -133,6 +134,10 @@ class Setup(ConfigListScreen, Screen):
 				if item_level > config.usage.setup_level.index:
 					continue
 
+				requires = x.getAttribute("requires")
+				if requires and not SystemInfo.get(requires, False):
+					continue;
+
 				item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
 				b = eval(XMLTools.mergeText(x.childNodes));
 				if b == "":