[Slim-Checkins] r12364 - /trunk/server/Slim/Plugin/Base.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Jul  8 13:50:29 2007
New Revision: 12364

URL: http://svn.slimdevices.com?rev=12364&view=rev
Log:
Bug: N/A
Description: plugins without setMode should not create button menu entries

Modified:
    trunk/server/Slim/Plugin/Base.pm

Modified: trunk/server/Slim/Plugin/Base.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/Base.pm?rev=12364&r1=12363&r2=12364&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/Base.pm (original)
+++ trunk/server/Slim/Plugin/Base.pm Sun Jul  8 13:50:29 2007
@@ -27,24 +27,22 @@
 		my $exitMode = $class->can('exitMode') ? sub { $class->exitMode(@_) } : undef;
 
 		Slim::Buttons::Common::addMode($mode, $class->getFunctions, sub { $class->setMode(@_) }, $exitMode);
+
+		my %params = (
+			'useMode' => $mode,
+			'header'  => $name,
+		);
+
+		# Add toplevel info for the option of having a plugin at the top level.
+		Slim::Buttons::Home::addMenuOption($name, \%params);
+
+		Slim::Buttons::Home::addSubMenu($menu, $name, \%params);
+
+		if ($menu ne PLUGINMENU) {
+
+			Slim::Buttons::Home::addSubMenu(PLUGINMENU, $menu, Slim::Buttons::Home::getMenu("-$menu"));
+		}
 	}
-
-	my %params = (
-		'useMode' => $mode,
-		'header'  => $name,
-	);
-
-	# Add toplevel info for the option of having a plugin at the top level.
-	Slim::Buttons::Home::addMenuOption($name, \%params);
-
-	Slim::Buttons::Home::addSubMenu($menu, $name, \%params);
-
-	if ($menu ne PLUGINMENU) {
-
-		Slim::Buttons::Home::addSubMenu(PLUGINMENU, $menu, Slim::Buttons::Home::getMenu("-$menu"));
-	}
-
-	#logWarning("Adding $name to menu $menu");
 
 	if ($class->can('webPages')) {
 
@@ -95,14 +93,6 @@
 	return {};
 }
 
-sub setMode {
-	my $class = shift;
-	my $client = shift;
-	my $method = shift;
-
-	return;
-}
-
 1;
 
 __END__