# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1290370267 0
# Node ID 931d0db6374db0d74076621a8700ca3b84777b12
# Parent  31968c23152c877b67991b7997d0d4e8f98a30a9
Catchup with Symbian1

diff -r 31968c23152c -r 931d0db6374d application/data/PodcastClient_spanish.rls
--- a/application/data/PodcastClient_spanish.rls	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/data/PodcastClient_spanish.rls	Sun Nov 21 20:11:07 2010 +0000
@@ -131,9 +131,13 @@
 // Show view
 
 rls_string STRING_r_view_mark_as_played_cmd_short "Marcar leido"
+rls_string STRING_r_view_mark_as_played_cmd_short "Marcar leido"
+rls_string STRING_r_view_mark_as_unplayed_cmd_short "Marcar nuevo"
 rls_string STRING_r_view_mark_as_unplayed_cmd_short "Marcar nuevo"
 rls_string STRING_r_view_download_show_cmd "Descargar"
+rls_string STRING_r_view_download_show_cmd_short "Descargar"
 rls_string STRING_r_view_delete_show_cmd "Borrar"
+rls_string STRING_r_view_delete_show_cmd_short "Borrar"
 rls_string STRING_r_view_show_info_cmd "Información"
 rls_string STRING_r_error_playback_failed "No se pudo reproducir el capítulo"
 
@@ -160,4 +164,13 @@
 rls_string STRING_r_add_url "Enter address"
 rls_string STRING_r_add_search "Search for feed"
 rls_string STRING_r_search_feed_prompt "Enter search terms:"
-
+rls_string STRING_r_new_shows "New shows"
+rls_string STRING_r_download_queue "Download queue"
+rls_string STRING_r_mark_all_old_query "Mark all shows old?"
+rls_string STRING_r_download_all_query "Add all shows to download queue?"
+rls_string STRING_r_podcast_setting_autodelete "Delete old shows"
+rls_string STRING_podcast_autodelete_option1 "Manually"
+rls_string STRING_podcast_autodelete_option2 "1 day after playing"
+rls_string STRING_podcast_autodelete_option3 "7 days after playing"
+rls_string STRING_podcast_autodelete_option4 "30 days after playing"
+rls_string STRING_r_download_all_shows "Download all shows"
diff -r 31968c23152c -r 931d0db6374d application/data/PodcastQueueView.ra
--- a/application/data/PodcastQueueView.ra	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/data/PodcastQueueView.ra	Sun Nov 21 20:11:07 2010 +0000
@@ -139,6 +139,25 @@
 						}  
 					};
 				};
+			},
+		TBAR_CTRL
+			{
+			type = EAknCtButton;
+			id = EPodcastEmpty;
+			control = AVKON_BUTTON
+				{
+				states =
+					{
+					AVKON_BUTTON_STATE
+						{
+						bmpfile = APPICON;
+						bmpid = EMbmPodcastEmpty;
+						bmpmask = EMbmPodcastEmpty_mask;
+						helptxt = "";
+						}  
+					};
+				};
 			}
+
         };
     }
diff -r 31968c23152c -r 931d0db6374d application/data/PodcastShowsView.ra
--- a/application/data/PodcastShowsView.ra	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/data/PodcastShowsView.ra	Sun Nov 21 20:11:07 2010 +0000
@@ -183,12 +183,10 @@
                             };
                         };
                     },
-// we keep the download toolbar button in S^3, but always disable it
-// because there are drawing issues with only one item in the toolbar
             TBAR_CTRL
 			{
 			type = EAknCtButton;
-			id = EPodcastDownloadShow;
+			id = EPodcastEmpty;
 			control = AVKON_BUTTON
 				{
 				states =
@@ -196,10 +194,9 @@
 					AVKON_BUTTON_STATE
 						{
 						bmpfile = APPICON;
-						bmpid = EMbmPodcastDownload;
-						bmpmask = EMbmPodcastDownload_mask;
-						//txt = STRING_r_view_download_show_cmd;
-						helptxt = STRING_r_view_download_show_cmd;
+						bmpid = EMbmPodcastEmpty;
+						bmpmask = EMbmPodcastEmpty_mask;
+						helptxt = "";
 						}  
 					};
 				};
diff -r 31968c23152c -r 931d0db6374d application/data/icons/appicon.svg
--- a/application/data/icons/appicon.svg	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/data/icons/appicon.svg	Sun Nov 21 20:11:07 2010 +0000
@@ -1,29 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" baseProfile="tiny" height="64px" version="1.1" viewBox="0 0 64 64" width="64px" x="0px" y="0px">
-<defs>
-<linearGradient gradientTransform="matrix(1,0,0,-1,-8.3599,138.6704)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="115.8752" x2="115.8752" y1="109.7727" y2="53.842999">
-<stop offset="0" style="stop-color:#CEDADE"/>
-<stop offset="1" style="stop-color:#919191"/>
-</linearGradient>
-<linearGradient gradientTransform="matrix(1,0,0,-1,-8.3599,138.6704)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="115.8752" x2="115.8752" y1="83.032501" y2="55.353802">
-<stop offset="0" style="stop-color:#FFCF75"/>
-<stop offset="1" style="stop-color:#BA6B16"/>
-</linearGradient>
-</defs>
-<g transform="matrix(0.8112284,0,0,0.8112284,-55.221247,-14.351236)">
-<path d="m 140.27,55.624 c 0.005,-0.197 0.008,-0.392 0.008,-0.584 0,-17.17 -14.697,-31.142 -32.761,-31.142 -18.063,0 -32.76,13.972 -32.76,31.142 0,0.192 0.002,0.387 0.008,0.584 -3.405,3.744 -5.317,8.626 -5.317,13.744 0,11.28 9.179,20.459 20.46,20.459 h 5 v -2.432 c 1.31,0.587 2.757,0.921 4.283,0.921 h 16.655 c 1.525,0 2.974,-0.334 4.283,-0.922 v 2.433 h 5 c 11.28,0 20.458,-9.179 20.458,-20.459 -10e-4,-5.118 -1.913,-10 -5.317,-13.744 z" style="opacity:0.5"/>
-<path d="m 135.125,59.592 c 0.09,-0.849 0.15,-1.697 0.15,-2.553 0,-14.413 -12.453,-26.142 -27.76,-26.142 -15.306,0 -27.76,11.729 -27.76,26.142 0,0.854 0.062,1.704 0.149,2.553 -3.336,2.834 -5.46,7.057 -5.46,11.775 0,8.534 6.922,15.459 15.46,15.459 V 55.911 c -1.34,0 -2.63,0.188 -3.868,0.508 0.358,-10.675 9.854,-19.256 21.479,-19.256 11.626,0 21.122,8.581 21.48,19.256 -1.238,-0.318 -2.529,-0.508 -3.868,-0.508 v 30.916 c 8.537,0 15.459,-6.925 15.459,-15.459 0,-4.719 -2.124,-8.942 -5.461,-11.776 z"/>
-<path d="M 115.845,57.639 H 99.189 c -3.043,0 -5.513,2.468 -5.513,5.513 v 16.655 c 0,3.045 2.47,5.51 5.513,5.51 h 16.653 c 3.047,0 5.514,-2.465 5.514,-5.51 V 63.152 c 0,-3.045 -2.467,-5.513 -5.511,-5.513 z m -15.372,23.547 c -1.471,0 -2.662,-1.192 -2.662,-2.663 0,-1.468 1.191,-2.663 2.662,-2.663 1.469,0 2.66,1.195 2.66,2.663 0.001,1.47 -1.192,2.663 -2.66,2.663 z m 6.433,0 c 0,-5.022 -4.072,-9.096 -9.096,-9.096 v -3.773 c 7.105,0 12.866,5.763 12.866,12.869 h -3.77 z m 6.434,0 c 0,-8.578 -6.954,-15.53 -15.529,-15.53 v -3.884 c 10.721,0 19.413,8.691 19.413,19.414 h -3.884 z"/>
-<linearGradient gradientTransform="matrix(1,0,0,-1,-8.3599,138.6704)" gradientUnits="userSpaceOnUse" x1="115.8752" x2="115.8752" y1="109.7727" y2="53.842999">
-<stop offset="0" style="stop-color:#CEDADE"/>
-<stop offset="1" style="stop-color:#919191"/>
-</linearGradient>
-<path d="m 135.125,57.592 c 0.09,-0.849 0.15,-1.697 0.15,-2.553 0,-14.413 -12.453,-26.142 -27.76,-26.142 -15.306,0 -27.76,11.729 -27.76,26.142 0,0.854 0.062,1.704 0.149,2.553 -3.336,2.834 -5.46,7.057 -5.46,11.775 0,8.534 6.922,15.459 15.46,15.459 V 53.911 c -1.34,0 -2.63,0.188 -3.868,0.508 0.358,-10.675 9.854,-19.256 21.479,-19.256 11.626,0 21.122,8.581 21.48,19.256 -1.238,-0.318 -2.529,-0.508 -3.868,-0.508 v 30.916 c 8.537,0 15.459,-6.925 15.459,-15.459 0,-4.719 -2.124,-8.942 -5.461,-11.776 z" style="fill:url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1,0,0,-1,-8.3599,138.6704)" gradientUnits="userSpaceOnUse" x1="115.8752" x2="115.8752" y1="83.032501" y2="55.353802">
-<stop offset="0" style="stop-color:#FFCF75"/>
-<stop offset="1" style="stop-color:#BA6B16"/>
-</linearGradient>
-<path d="M 115.845,55.639 H 99.189 c -3.043,0 -5.513,2.468 -5.513,5.513 v 16.655 c 0,3.045 2.47,5.51 5.513,5.51 h 16.653 c 3.047,0 5.514,-2.465 5.514,-5.51 V 61.152 c 0,-3.045 -2.467,-5.513 -5.511,-5.513 z m -15.372,23.547 c -1.471,0 -2.662,-1.192 -2.662,-2.663 0,-1.468 1.191,-2.663 2.662,-2.663 1.469,0 2.66,1.195 2.66,2.663 0.001,1.47 -1.192,2.663 -2.66,2.663 z m 6.433,0 c 0,-5.022 -4.072,-9.096 -9.096,-9.096 v -3.773 c 7.105,0 12.866,5.763 12.866,12.869 h -3.77 z m 6.434,0 c 0,-8.578 -6.954,-15.53 -15.529,-15.53 v -3.884 c 10.721,0 19.413,8.691 19.413,19.414 h -3.884 z" style="fill:url(#SVGID_2_)"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<g>
+	<path opacity="0.7" enable-background="new    " d="M58.553,30.663c0.004-0.16,0.006-0.318,0.006-0.474
+		c0-13.929-11.922-25.263-26.576-25.263C17.33,4.926,5.407,16.26,5.407,30.189c0,0.156,0.002,0.314,0.007,0.474
+		C2.651,33.701,1.1,37.66,1.1,41.812c0,9.15,7.446,16.598,16.598,16.598h4.057v-1.973c1.062,0.477,2.236,0.746,3.474,0.746h13.51
+		c1.238,0,2.413-0.27,3.475-0.748v1.975h4.057c9.15,0,16.596-7.447,16.596-16.598C62.865,37.66,61.313,33.701,58.553,30.663z"/>
+	<rect x="22.141" y="33.977" fill="#FFFFFF" width="18.864" height="18.01"/>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="370.1719" y1="344.6709" x2="370.1719" y2="400.6035" gradientTransform="matrix(0.8112 0 0 0.8112 -268.3027 -270.616)">
+			<stop  offset="0" style="stop-color:#CEDADE"/>
+			<stop  offset="1" style="stop-color:#919191"/>
+		</linearGradient>
+		<path fill="url(#SVGID_1_)" d="M54.379,32.259c0.072-0.689,0.121-1.377,0.121-2.071c0-11.692-10.102-21.207-22.519-21.207
+			c-12.417,0-22.52,9.515-22.52,21.207c0,0.693,0.05,1.382,0.121,2.071c-2.706,2.299-4.43,5.725-4.43,9.553
+			c0,6.922,5.615,12.541,12.542,12.541V29.273c-1.087,0-2.134,0.152-3.138,0.412c0.29-8.66,7.993-15.621,17.424-15.621
+			c9.431,0,17.134,6.961,17.425,15.621c-1.005-0.258-2.053-0.412-3.139-0.412v25.081c6.926,0,12.541-5.617,12.541-12.541
+			C58.809,37.984,57.086,34.559,54.379,32.259L54.379,32.259z"/>
+		<path fill="#F7981D" d="M37.178,30.607H26.974c-3.662,0-6.64,2.979-6.64,6.641v10.205c0,3.662,2.978,6.641,6.64,6.641h10.204
+			c3.662,0,6.642-2.979,6.642-6.641V37.248C43.819,33.588,40.839,30.607,37.178,30.607z M26.067,50.891
+			c-1.023,0-1.854-0.83-1.854-1.854c0-1.025,0.831-1.852,1.854-1.852c1.022,0,1.852,0.826,1.852,1.852
+			C27.918,50.061,27.089,50.891,26.067,50.891z M33.521,51.223c-0.759,0-1.372-0.613-1.372-1.371c0-1.848-0.72-3.584-2.026-4.893
+			c-1.308-1.307-3.046-2.027-4.894-2.027c0,0,0,0-0.002,0c-0.758,0-1.356-0.615-1.371-1.373c-0.019-1.139,1.117-1.348,1.373-1.369
+			c0.256-0.023,0.287,0.002,0.429,0.008c2.419,0.105,4.678,1.098,6.401,2.824c1.824,1.824,2.829,4.25,2.829,6.83
+			C34.889,50.609,34.276,51.223,33.521,51.223z M38.93,51.223c-0.759,0-1.373-0.613-1.373-1.371c0-3.293-1.284-6.387-3.611-8.717
+			c-2.327-2.328-5.424-3.611-8.716-3.611c-0.76,0-1.372-0.613-1.372-1.371c0-0.756,0.612-1.371,1.372-1.371
+			c4.026,0,7.81,1.568,10.651,4.414c2.849,2.846,4.416,6.631,4.416,10.658C40.297,50.609,39.686,51.223,38.93,51.223z"/>
+	</g>
 </g>
 </svg>
diff -r 31968c23152c -r 931d0db6374d application/data/icons/feed.svg
--- a/application/data/icons/feed.svg	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/data/icons/feed.svg	Sun Nov 21 20:11:07 2010 +0000
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Feed" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#FFFFFF" d="M22.541,1H9.458C4.794,1,1,4.794,1,9.458v13.083C1,27.205,4.794,31,9.458,31h13.083
+	C27.205,31,31,27.206,31,22.542V9.458C31,4.794,27.205,1,22.541,1z"/>
 <g>
-	<g>
-		<path fill="#FFFFFF" d="M9.458,0C4.256,0,0,4.256,0,9.458v13.083C0,27.744,4.256,32,9.458,32h13.083
-			C27.743,32,32,27.744,32,22.542V9.458C32,4.256,27.743,0,22.541,0H9.458z"/>
-	</g>
-	<g>
-		<path fill="#F7991F" d="M9.458,0C4.256,0,0,4.256,0,9.458v13.083C0,27.744,4.256,32,9.458,32h13.083
-			C27.743,32,32,27.744,32,22.542V9.458C32,4.256,27.743,0,22.541,0H9.458z M8.294,26.947c-1.312,0-2.376-1.062-2.376-2.375
-			c0-1.313,1.064-2.375,2.376-2.375s2.375,1.062,2.375,2.375C10.669,25.885,9.605,26.947,8.294,26.947z M17.852,27.374
-			c-0.972,0-1.759-0.787-1.759-1.758c0-2.368-0.923-4.597-2.599-6.272c-1.676-1.676-3.904-2.6-6.273-2.6c0,0-0.001,0-0.003,0
-			c-0.971,0-1.739-0.789-1.757-1.759c-0.026-1.461,1.432-1.729,1.76-1.757c0.328-0.029,0.367,0.003,0.548,0.011
-			c3.103,0.135,5.999,1.408,8.208,3.62c2.339,2.339,3.628,5.449,3.628,8.758C19.607,26.587,18.82,27.374,17.852,27.374z
-			 M24.786,27.374c-0.972,0-1.759-0.787-1.759-1.758c0-4.222-1.646-8.189-4.631-11.176c-2.984-2.984-6.955-4.63-11.176-4.63
-			c-0.973,0-1.758-0.785-1.758-1.757c0-0.969,0.785-1.756,1.758-1.756c5.162,0,10.014,2.01,13.658,5.658
-			c3.651,3.647,5.661,8.501,5.66,13.662C26.54,26.587,25.756,27.374,24.786,27.374z"/>
-	</g>
-	<path d="M22.541,0.946c4.693,0,8.514,3.819,8.514,8.513v13.083c0,4.694-3.818,8.513-8.514,8.513H9.458
-		c-4.694,0-8.513-3.818-8.513-8.513V9.458c0-4.694,3.819-8.513,8.513-8.513L22.541,0.946 M22.541,0H9.458C4.256,0,0,4.256,0,9.458
-		v13.083C0,27.744,4.256,32,9.458,32h13.083C27.743,32,32,27.744,32,22.542V9.458C32,4.256,27.743,0,22.541,0L22.541,0z"/>
+	<path fill="#F7991F" d="M9.458,0C4.256,0,0,4.256,0,9.458v13.083C0,27.744,4.256,32,9.458,32h13.083C27.743,32,32,27.744,32,22.542
+		V9.458C32,4.256,27.743,0,22.541,0H9.458z M8.294,26.947c-1.312,0-2.376-1.062-2.376-2.375c0-1.313,1.064-2.375,2.376-2.375
+		s2.375,1.062,2.375,2.375C10.669,25.885,9.605,26.947,8.294,26.947z M17.852,27.374c-0.972,0-1.759-0.787-1.759-1.758
+		c0-2.368-0.923-4.597-2.599-6.272c-1.676-1.676-3.904-2.6-6.273-2.6c0,0-0.001,0-0.003,0c-0.971,0-1.739-0.789-1.757-1.759
+		c-0.026-1.461,1.432-1.729,1.76-1.757c0.328-0.029,0.367,0.003,0.548,0.011c3.103,0.135,5.999,1.408,8.208,3.62
+		c2.339,2.339,3.628,5.449,3.628,8.758C19.607,26.587,18.82,27.374,17.852,27.374z M24.786,27.374c-0.972,0-1.759-0.787-1.759-1.758
+		c0-4.222-1.645-8.189-4.631-11.176c-2.984-2.984-6.954-4.63-11.176-4.63c-0.973,0-1.758-0.785-1.758-1.757
+		c0-0.969,0.785-1.756,1.758-1.756c5.162,0,10.014,2.01,13.658,5.658c3.651,3.647,5.661,8.501,5.66,13.662
+		C26.54,26.587,25.756,27.374,24.786,27.374z"/>
 </g>
 </svg>
diff -r 31968c23152c -r 931d0db6374d application/data/icons/mark_old_all.svg
--- a/application/data/icons/mark_old_all.svg	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/data/icons/mark_old_all.svg	Sun Nov 21 20:11:07 2010 +0000
@@ -5,9 +5,9 @@
 	 x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
 <g>
 	<g>
-		<circle fill="#FFFFFF" cx="28.432" cy="13.312" r="1.485"/>
-		<circle fill="#FFFFFF" cx="28.432" cy="18.996" r="1.486"/>
-		<circle fill="#FFFFFF" cx="28.432" cy="24.679" r="1.486"/>
+		<circle fill="#FFFFFF" cx="28.432" cy="10.312" r="1.485"/>
+		<circle fill="#FFFFFF" cx="28.432" cy="15.996" r="1.486"/>
+		<circle fill="#FFFFFF" cx="28.432" cy="21.679" r="1.486"/>
 	</g>
 </g>
 <g>
diff -r 31968c23152c -r 931d0db6374d application/group/bld.inf
--- a/application/group/bld.inf	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/group/bld.inf	Sun Nov 21 20:11:07 2010 +0000
@@ -80,5 +80,6 @@
 	-c16,1 update.svg\
 	-c16,1 update_all.svg\
 	-c16,1 update_cancel.svg\
-	-c16,1 download.svg		
+	-c16,1 download.svg\
+	-c16,1 empty.svg
 END
diff -r 31968c23152c -r 931d0db6374d application/inc/Podcast.hrh
--- a/application/inc/Podcast.hrh	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/inc/Podcast.hrh	Sun Nov 21 20:11:07 2010 +0000
@@ -66,7 +66,8 @@
 	EPodcastResetDb,
 	EPodcastTabFeeds,
 	EPodcastTabQueue,
-	EPodcastTabNew
+	EPodcastTabNew,
+	EPodcastEmpty
 	};
 
 enum TPodcastControl
diff -r 31968c23152c -r 931d0db6374d application/src/PodcastQueueView.cpp
--- a/application/src/PodcastQueueView.cpp	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/src/PodcastQueueView.cpp	Sun Nov 21 20:11:07 2010 +0000
@@ -373,7 +373,10 @@
 		toolbar->SetItemDimmed(EPodcastRemoveAllDownloads, itemCnt == 0, ETrue);
 		toolbar->HideItem(EPodcastSuspendDownloads,iPodcastModel.SettingsEngine().DownloadSuspended(), ETrue);
 		toolbar->HideItem(EPodcastResumeDownloads,!iPodcastModel.SettingsEngine().DownloadSuspended(), ETrue);	
-		toolbar->SetItemDimmed(EPodcastRemoveDownload, itemCnt == 0, ETrue);		
+		toolbar->SetItemDimmed(EPodcastRemoveDownload, itemCnt == 0, ETrue);
+		toolbar->HideItem(EPodcastEmpty, EFalse, ETrue );
+		toolbar->SetItemDimmed(EPodcastEmpty, ETrue, ETrue);
+
 		}
 	}
 
diff -r 31968c23152c -r 931d0db6374d application/src/PodcastShowsView.cpp
--- a/application/src/PodcastShowsView.cpp	Fri Nov 19 01:47:31 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Sun Nov 21 20:11:07 2010 +0000
@@ -801,10 +801,10 @@
 
 		toolbar->HideItem(EPodcastCancelUpdateAllFeeds, !updatingState, ETrue );
 		
-		// there seems to be drawing bugs in the toolbar if there is only
-		// one or two buttons defined in the resource, so we have download
-		// there but always hidden
-		toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue );
+	
+		toolbar->HideItem(EPodcastEmpty, EFalse, ETrue );
+		toolbar->SetItemDimmed(EPodcastEmpty, ETrue, ETrue);
+		
 		toolbar->HideItem(EPodcastDownloadAll, !iShowNewShows, ETrue);
 		
 		TBool showMarkAllPlayed = EFalse;
diff -r 31968c23152c -r 931d0db6374d engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp	Fri Nov 19 01:47:31 2010 +0000
+++ b/engine/src/ShowEngine.cpp	Sun Nov 21 20:11:07 2010 +0000
@@ -575,6 +575,23 @@
 		{
 		User::Leave(KErrCorrupt);
 		}
+	
+	// now update DB
+	_LIT(KSqlStatement2, "update shows set downloadstate=%d and deletedate = 0 where downloadstate=%d and deletedate != 0 and deletedate < \"%Ld\"");
+	iSqlBuffer.Format(KSqlStatement2, ENotDownloaded, EDownloaded, now.Int64());
+
+
+	rc = sqlite3_prepare16_v2(&iDB, (const void*) iSqlBuffer.PtrZ(), -1,
+			&st, (const void**) NULL);
+
+	if (rc == SQLITE_OK)
+		{
+		rc = sqlite3_step(st);
+		Cleanup_sqlite3_finalize_PushL(st);
+		CleanupStack::PopAndDestroy();//st
+		}
+
+	
 	DP("CShowEngine::DBGetOldShowsL END");
 	}
 
diff -r 31968c23152c -r 931d0db6374d group/defines.h
--- a/group/defines.h	Fri Nov 19 01:47:31 2010 +0000
+++ b/group/defines.h	Sun Nov 21 20:11:07 2010 +0000
@@ -2,6 +2,6 @@
 #define DEFINES_H_
 
 // MPX integration can not be enabled for self signed versions 
-//#define ENABLE_MPX_INTEGRATION
+#define ENABLE_MPX_INTEGRATION
 
 #endif /* DEFINES_H_ */