--- a/application/data/PodcastQueueView.ra Sat Mar 13 18:48:25 2010 +0000
+++ b/application/data/PodcastQueueView.ra Sat Mar 13 22:00:39 2010 +0000
@@ -140,11 +140,6 @@
{
items =
{
- /* STYLUS_POPUP_MENU_ITEM
- {
- txt = STRING_r_view_show_info_cmd;
- command = EPodcastShowInfo;
- },*/
STYLUS_POPUP_MENU_ITEM
{
txt = STRING_r_view_remove_download_short_cmd;
--- a/application/group/Podcast.mmp Sat Mar 13 18:48:25 2010 +0000
+++ b/application/group/Podcast.mmp Sat Mar 13 22:00:39 2010 +0000
@@ -16,7 +16,7 @@
*
*/
-//MACRO SYMBIAN1_UI
+MACRO SYMBIAN1_UI
TARGET Podcast.exe
TARGETTYPE exe
Binary file application/sis/podcatcher_udeb.sis has changed
Binary file application/sis/podcatcher_udeb_signed.sis has changed
Binary file application/sis/podcatcher_urel.sis has changed
Binary file application/sis/podcatcher_urel_signed.sis has changed
--- a/application/src/PodcastQueueView.cpp Sat Mar 13 18:48:25 2010 +0000
+++ b/application/src/PodcastQueueView.cpp Sat Mar 13 22:00:39 2010 +0000
@@ -126,12 +126,15 @@
iPodcastModel.FeedEngine().AddObserver(this);
iPodcastModel.ShowEngine().AddObserver(this);
-
+
+ // no popup options apply to S^1
+#ifndef SYMBIAN1_UI
iStylusPopupMenu = CAknStylusPopUpMenu::NewL( this , TPoint(0,0));
TResourceReader reader;
iCoeEnv->CreateResourceReaderLC(reader,R_QUEUEVIEW_POPUP_MENU);
iStylusPopupMenu->ConstructFromResourceL(reader);
CleanupStack::PopAndDestroy();
+#endif
SetEmptyTextL(R_PODCAST_EMPTY_QUEUE);
}
--- a/application/src/PodcastSearchView.cpp Sat Mar 13 18:48:25 2010 +0000
+++ b/application/src/PodcastSearchView.cpp Sat Mar 13 22:00:39 2010 +0000
@@ -131,6 +131,8 @@
iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID);
((CPodcastAppUi*)AppUi())->NaviSetTextL(R_SEARCH_RESULTS);
+
+ UpdateListboxItemsL();
UpdateToolbar();
}
@@ -269,8 +271,7 @@
void CPodcastSearchView::OpmlParsingComplete(TInt /*aError*/, TUint /*aNumFeedsImported*/)
{
DP("CPodcastSearchView::OpmlParsingComplete BEGIN");
- UpdateListboxItemsL();
- UpdateToolbar();
+
DP("CPodcastSearchView::OpmlParsingComplete END");
}
--- a/engine/src/PodcastModel.cpp Sat Mar 13 18:48:25 2010 +0000
+++ b/engine/src/PodcastModel.cpp Sat Mar 13 22:00:39 2010 +0000
@@ -239,6 +239,7 @@
sqlite3* CPodcastModel::DB()
{
+ DP("CPodcastModel::DB BEGIN");
if (iDB == NULL) {
TFileName dbFileName;
iFsSession.PrivatePath(dbFileName);
@@ -256,7 +257,8 @@
TBuf8<KMaxFileName> filename8;
filename8.Copy(dbFileName);
- int rc = rc = sqlite3_open((const char*) filename8.PtrZ(), &iDB);
+ DP("Before sqlite3_open");
+ int rc = sqlite3_open((const char*) filename8.PtrZ(), &iDB);
if( rc != SQLITE_OK){
DP("Error loading DB");
User::Panic(_L("Podcatcher"), 10);
@@ -264,6 +266,7 @@
}
+ DP("CPodcastModel::DB END");
return iDB;
}