[Slim-Checkins] r12803 - /trunk/server/Slim/Buttons/XMLBrowser.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Thu Aug 30 14:06:43 2007
New Revision: 12803

URL: http://svn.slimdevices.com?rev=12803&view=rev
Log:
XMLBrowser subfeed title may be different than the menu item, fixed for CLI.  Jive needs additional code to support this title

Modified:
    trunk/server/Slim/Buttons/XMLBrowser.pm

Modified: trunk/server/Slim/Buttons/XMLBrowser.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/XMLBrowser.pm?rev=12803&r1=12802&r2=12803&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/XMLBrowser.pm (original)
+++ trunk/server/Slim/Buttons/XMLBrowser.pm Thu Aug 30 14:06:43 2007
@@ -1282,7 +1282,7 @@
 				}
 				
 				$log->debug("Asynchronously fetching subfeed " . $subFeed->{url} . " - will be back!");
-				
+
 				Slim::Formats::XML->getFeedAsync(
 					\&_cliQuerySubFeed_done,
 					\&_cliQuery_error,
@@ -1533,6 +1533,8 @@
 			$request->addResult('offset', $start) if $menuMode;
 
 			if ($valid) {
+				
+				$request->addResult( 'title', $subFeed->{'name'} || $subFeed->{'title'} );
 				
 				for my $item ( @{$subFeed->{'items'}}[$start..$end] ) {
 					
@@ -1648,6 +1650,11 @@
 	} else {
 		# otherwise insert items as subfeed
 		$subFeed->{'items'} = $feed->{'items'};
+		
+		# Update the title value in case it's different from the previous menu
+		if ( $feed->{'title'} ) {
+			$subFeed->{'name'} = $feed->{'title'};
+		}
 	}
 
 	$subFeed->{'fetched'} = 1;