Merge commit 'origin/bug_308_add_where_softwaremanager' into experimental

Conflicts:
	lib/python/Plugins/Plugin.py

diff --cc lib/python/Plugins/Plugin.py
index dc68ebf,8d538ef..7cf0c18
--- 1/lib/python/Plugins/Plugin.py
--- 2/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@@ -52,8 -52,12 +52,14 @@@ class PluginDescriptor
        # reason (True: Networkconfig read finished, False: Networkconfig reload initiated )
        WHERE_NETWORKCONFIG_READ = 12
  
 +      WHERE_AUDIOMENU = 13
 +
+       # fnc 'SoftwareSupported' or  'AdvancedSoftwareSupported' must take a parameter and return None
+       # if the plugin should not be displayed inside Softwaremanger or return a function which is called with session
+       # and 'None' as parameter to call the plugin from the Softwaremanager menus. "menuEntryName" and "menuEntryDescription"
+       # should be provided to name and describe the new menu entry.
+       WHERE_SOFTWAREMANAGER = 14
+ 
        def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, internal = False):
                self.name = name
                self.internal = internal

diff --cc lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
Simple merge