# HG changeset patch # User teknolog # Date 1272713734 -3600 # Node ID add4bcf062982d37be27bc1fba65b84544c98ff4 # Parent 2e267e7da513390d23305761646dbc6c8950c859 Workaround to allow Podcatcher to start even if RCmManager.Open returns -1, which it does for some reasaon in PDK 3.0.h diff -r 2e267e7da513 -r add4bcf06298 application/group/Podcast.mmp --- a/application/group/Podcast.mmp Wed Apr 28 14:38:03 2010 +0100 +++ b/application/group/Podcast.mmp Sat May 01 12:35:34 2010 +0100 @@ -97,3 +97,4 @@ LIBRARY ws32.lib LIBRARY hlplch.lib LIBRARY bitgdi.lib +LIBRARY cmmanager.lib diff -r 2e267e7da513 -r add4bcf06298 application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r 2e267e7da513 -r add4bcf06298 application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r 2e267e7da513 -r add4bcf06298 application/sis/podcatcher_urel.sis Binary file application/sis/podcatcher_urel.sis has changed diff -r 2e267e7da513 -r add4bcf06298 application/sis/podcatcher_urel_signed.sis Binary file application/sis/podcatcher_urel_signed.sis has changed diff -r 2e267e7da513 -r add4bcf06298 engine/group/engine.mmp --- a/engine/group/engine.mmp Wed Apr 28 14:38:03 2010 +0100 +++ b/engine/group/engine.mmp Sat May 01 12:35:34 2010 +0100 @@ -28,7 +28,6 @@ SYSTEMINCLUDE \epoc32\include\platform\mw SYSTEMINCLUDE \epoc32\include\stdapis -// Engine SOURCE HttpClient.cpp SOURCE HttpEventHandler.cpp SOURCE FeedParser.cpp diff -r 2e267e7da513 -r add4bcf06298 engine/src/PodcastModel.cpp --- a/engine/src/PodcastModel.cpp Wed Apr 28 14:38:03 2010 +0100 +++ b/engine/src/PodcastModel.cpp Sat May 01 12:35:34 2010 +0100 @@ -72,21 +72,25 @@ { DP("CPodcastModel::ConstructL BEGIN"); User::LeaveIfError(iFsSession.Connect()); - iCommDB = CCommsDatabase::NewL (EDatabaseTypeUnspecified); - //iCommDB ->ShowHiddenRecords(); // magic iIapNameArray = new (ELeave) CDesCArrayFlat(KDefaultGranu); iSNAPNameArray = new (ELeave) CDesCArrayFlat(KDefaultGranu); - iCmManager.OpenL(); + iImageHandler = CImageHandler::NewL(FsSession(), *this); + + TRAPD(err,iCmManager.OpenL()); + DP1("iCmManager.OpenL(),err=%d;", err); - UpdateIAPListL(); - UpdateSNAPListL(); + if (err == KErrNone) + { + UpdateIAPListL(); + UpdateSNAPListL(); + } iSettingsEngine = CSettingsEngine::NewL(*this); iConnectionEngine = CConnectionEngine::NewL(*this); - TRAPD(err, OpenDBL()); + TRAP(err, OpenDBL()); if (err != KErrNone) {