Sync with symbian3 branch symbian1
authorSebastian Brannstrom <sebastianb@symbian.org>
Tue, 16 Nov 2010 10:39:20 +0000
branchsymbian1
changeset 364 998e9d114bd5
parent 363 9a575d14462a
child 365 3317b29a19f1
Sync with symbian3 branch
application/src/PodcastShowsView.cpp
engine/inc/PodcastModel.h
engine/inc/SettingsEngine.h
engine/src/ShowEngine.cpp
--- a/application/src/PodcastShowsView.cpp	Tue Nov 16 09:37:24 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Tue Nov 16 10:39:20 2010 +0000
@@ -656,6 +656,7 @@
 			HandleSetShowPlayedL(EFalse);
 			break;
 		case EPodcastMarkAllPlayed:
+			{
 			if (iShowNewShows) {
 				TBuf<KMaxMessageLength> msg;
 				iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY);
@@ -666,6 +667,7 @@
 			}
 			iPodcastModel.MarkSelectionPlayedL();
 			UpdateListboxItemsL();
+			}
 			break;
 		case EPodcastDeleteShow:
 			HandleDeleteShowL();
--- a/engine/inc/PodcastModel.h	Tue Nov 16 09:37:24 2010 +0000
+++ b/engine/inc/PodcastModel.h	Tue Nov 16 10:39:20 2010 +0000
@@ -27,7 +27,6 @@
 #include <cmmanager.h>
 #include <aknserverapp.h>  // MAknServerAppExitObserver
 #include <DocumentHandler.h>
-
 #include "FeedInfo.h"
 #include "ShowInfo.h"
 #include "debug.h"
--- a/engine/inc/SettingsEngine.h	Tue Nov 16 09:37:24 2010 +0000
+++ b/engine/inc/SettingsEngine.h	Tue Nov 16 10:39:20 2010 +0000
@@ -52,8 +52,7 @@
 	{
 	EAutoDeleteOff,
 	EAutoDeleteAfter1Day,	
-	EAutoDeleteAfter7Days,
-	EAutoDeleteAfter3Days
+	EAutoDeleteAfter7Days
 	};
 
 class CSettingsEngine : public CBase
--- a/engine/src/ShowEngine.cpp	Tue Nov 16 09:37:24 2010 +0000
+++ b/engine/src/ShowEngine.cpp	Tue Nov 16 10:39:20 2010 +0000
@@ -1666,9 +1666,6 @@
 		case EAutoDeleteAfter7Days:
 			daysAhead = 7;
 			break;
-		case EAutoDeleteAfter3Days:
-			daysAhead = 30;
-			break;
 		}
 	
 	TTime deleteDate;