# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1272747499 -3600
# Node ID 6e40b14bb2cd1120e8b5d8b6de2d6ee90cef11d4
# Parent  6284a24658d6cdd0ce2e89d3e99121ceb7415093# Parent  5382889bbbb4b242c59b8491dcd72563c2811cac
Merge Sebastian's changes

diff -r 6284a24658d6 -r 6e40b14bb2cd application/group/Podcast.mmp
--- a/application/group/Podcast.mmp	Sat May 01 21:56:59 2010 +0100
+++ b/application/group/Podcast.mmp	Sat May 01 21:58:19 2010 +0100
@@ -97,3 +97,4 @@
 LIBRARY ws32.lib 
 LIBRARY hlplch.lib
 LIBRARY bitgdi.lib 
+LIBRARY cmmanager.lib 
diff -r 6284a24658d6 -r 6e40b14bb2cd application/sis/podcatcher_udeb.sis
Binary file application/sis/podcatcher_udeb.sis has changed
diff -r 6284a24658d6 -r 6e40b14bb2cd application/sis/podcatcher_udeb_signed.sis
Binary file application/sis/podcatcher_udeb_signed.sis has changed
diff -r 6284a24658d6 -r 6e40b14bb2cd application/sis/podcatcher_urel.sis
Binary file application/sis/podcatcher_urel.sis has changed
diff -r 6284a24658d6 -r 6e40b14bb2cd application/sis/podcatcher_urel_signed.sis
Binary file application/sis/podcatcher_urel_signed.sis has changed
diff -r 6284a24658d6 -r 6e40b14bb2cd engine/group/engine.mmp
--- a/engine/group/engine.mmp	Sat May 01 21:56:59 2010 +0100
+++ b/engine/group/engine.mmp	Sat May 01 21:58:19 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 6284a24658d6 -r 6e40b14bb2cd engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Sat May 01 21:56:59 2010 +0100
+++ b/engine/src/PodcastModel.cpp	Sat May 01 21:58:19 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)
 		{