Index: /home/mh/eclipse/SVN/Plugins/ShoutcastBrowser/Plugin.pm =================================================================== --- /home/mh/eclipse/SVN/Plugins/ShoutcastBrowser/Plugin.pm (revision 3079) +++ /home/mh/eclipse/SVN/Plugins/ShoutcastBrowser/Plugin.pm (working copy) @@ -652,8 +652,19 @@ sub getFunctions { return \%functions; } -sub addMenu { return 'RADIO'; } +sub addMenu { + my $disabled = scalar(grep {$_ eq 'ShoutcastBrowser::Plugin'} Slim::Utils::Prefs::getArray('disabledplugins')); + $disabled && $::d_plugins && Slim::Utils::Misc::msg("ShoutcastBrowser: plugin disabled.\n"); + if ($disabled) { + Slim::Web::Pages::addLinks("radio", { 'PLUGIN_SHOUTCASTBROWSER_MODULE_NAME' => undef }); + } else { + Slim::Web::Pages::addLinks("radio", { 'PLUGIN_SHOUTCASTBROWSER_MODULE_NAME' => "plugins/ShoutcastBrowser/index.html" }); + } + + return 'RADIO'; +} + sub setupGroup { my %setupGroup = ( @@ -1293,7 +1304,6 @@ sub webPages { my %pages = ("index\.htm" => \&handleWebIndex); - Slim::Web::Pages::addLinks("radio", { 'PLUGIN_SHOUTCASTBROWSER_MODULE_NAME' => "plugins/ShoutcastBrowser/index.html" }); return (\%pages); } Index: /home/mh/eclipse/SVN/Plugins/RadioIO/Plugin.pm =================================================================== --- /home/mh/eclipse/SVN/Plugins/RadioIO/Plugin.pm (revision 3079) +++ /home/mh/eclipse/SVN/Plugins/RadioIO/Plugin.pm (working copy) @@ -163,6 +163,16 @@ sub addMenu { my $menu = "RADIO"; + + my $disabled = scalar(grep {$_ eq 'RadioIO::Plugin'} Slim::Utils::Prefs::getArray('disabledplugins')); + $disabled && $::d_plugins && Slim::Utils::Misc::msg("RadioIO: plugin disabled.\n"); + + if ($disabled) { + Slim::Web::Pages::addLinks("radio", { 'PLUGIN_RADIOIO_MODULE_NAME' => undef }); + } else { + Slim::Web::Pages::addLinks("radio", { 'PLUGIN_RADIOIO_MODULE_NAME' => "plugins/RadioIO/index.html" }); + } + return $menu; } @@ -173,8 +183,7 @@ # Web pages sub webPages { - my %pages = ("index\.htm" => \&handleWebIndex); - Slim::Web::Pages::addLinks("radio", { 'PLUGIN_RADIOIO_MODULE_NAME' => "plugins/RadioIO/index.html" }); + my %pages = ("index\.htm" => \&handleWebIndex); return (\%pages); } Index: /home/mh/eclipse/SVN/Plugins/Picks/Plugin.pm =================================================================== --- /home/mh/eclipse/SVN/Plugins/Picks/Plugin.pm (revision 3079) +++ /home/mh/eclipse/SVN/Plugins/Picks/Plugin.pm (working copy) @@ -217,6 +217,15 @@ } sub addMenu { + my $disabled = scalar(grep {$_ eq 'Picks::Plugin'} Slim::Utils::Prefs::getArray('disabledplugins')); + $disabled && $::d_plugins && Slim::Utils::Misc::msg("Picks: plugin disabled.\n"); + + if ($disabled) { + Slim::Web::Pages::addLinks("radio", { 'PLUGIN_PICKS_MODULE_NAME' => undef }); + } else { + Slim::Web::Pages::addLinks("radio", { 'PLUGIN_PICKS_MODULE_NAME' => "plugins/Picks/index.html" }); + } + return "RADIO"; } @@ -225,7 +234,6 @@ sub webPages { my %pages = ("index\.htm" => \&handleWebIndex); - Slim::Web::Pages::addLinks("radio", { 'PLUGIN_PICKS_MODULE_NAME' => "plugins/Picks/index.html" }); return (\%pages); }