# HG changeset patch # User Sebastian Brannstrom # Date 1289903960 0 # Node ID 998e9d114bd5b0de6329b0474babddb249dfdf07 # Parent 9a575d14462aa4843bf4dba8d0c5ace738a55aed Sync with symbian3 branch diff -r 9a575d14462a -r 998e9d114bd5 application/src/PodcastShowsView.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 msg; iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY); @@ -666,6 +667,7 @@ } iPodcastModel.MarkSelectionPlayedL(); UpdateListboxItemsL(); + } break; case EPodcastDeleteShow: HandleDeleteShowL(); diff -r 9a575d14462a -r 998e9d114bd5 engine/inc/PodcastModel.h --- 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 #include // MAknServerAppExitObserver #include - #include "FeedInfo.h" #include "ShowInfo.h" #include "debug.h" diff -r 9a575d14462a -r 998e9d114bd5 engine/inc/SettingsEngine.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 diff -r 9a575d14462a -r 998e9d114bd5 engine/src/ShowEngine.cpp --- 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;