# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1287854547 -3600
# Node ID cf384229067198a4ae8bdaf056da6bef329e164b
# Parent  03285b1fc18da029ff2a03f8589643f2210ff374
Fix for startup bug in Symbian 3 version; new SIS v 1.00.6

diff -r 03285b1fc18d -r cf3842290671 application/inc/buildno.h
--- a/application/inc/buildno.h	Sat Oct 23 16:38:32 2010 +0100
+++ b/application/inc/buildno.h	Sat Oct 23 18:22:27 2010 +0100
@@ -1,2 +1,2 @@
 // Build number generated by increment_buildno.py, do not edit manually

-#define BUILD_NO 5
\ No newline at end of file
+#define BUILD_NO 6
\ No newline at end of file
diff -r 03285b1fc18d -r cf3842290671 application/sis/buildno.txt
--- a/application/sis/buildno.txt	Sat Oct 23 16:38:32 2010 +0100
+++ b/application/sis/buildno.txt	Sat Oct 23 18:22:27 2010 +0100
@@ -1,1 +1,1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff -r 03285b1fc18d -r cf3842290671 application/sis/podcatcher_udeb.pkg
--- a/application/sis/podcatcher_udeb.pkg	Sat Oct 23 16:38:32 2010 +0100
+++ b/application/sis/podcatcher_udeb.pkg	Sat Oct 23 18:22:27 2010 +0100
@@ -1,7 +1,7 @@
 &EN,SP
 :"Symbian Foundation"
 %{"Podcatcher","Podcatcher"}
-#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 5, TYPE=SA
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 6, TYPE=SA
 
 ;Supports Symbian^3
 [0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
diff -r 03285b1fc18d -r cf3842290671 application/sis/podcatcher_udeb.sis
Binary file application/sis/podcatcher_udeb.sis has changed
diff -r 03285b1fc18d -r cf3842290671 application/sis/podcatcher_udeb_signed.sis
Binary file application/sis/podcatcher_udeb_signed.sis has changed
diff -r 03285b1fc18d -r cf3842290671 application/sis/podcatcher_urel.pkg
--- a/application/sis/podcatcher_urel.pkg	Sat Oct 23 16:38:32 2010 +0100
+++ b/application/sis/podcatcher_urel.pkg	Sat Oct 23 18:22:27 2010 +0100
@@ -1,7 +1,7 @@
 &EN,SP
 :"Symbian Foundation"
 %{"Podcatcher","Podcatcher"}
-#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, 5, TYPE=SA
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, 6, TYPE=SA
 
 ;Supports Symbian^3
 [0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
diff -r 03285b1fc18d -r cf3842290671 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Sat Oct 23 16:38:32 2010 +0100
+++ b/engine/src/PodcastModel.cpp	Sat Oct 23 18:22:27 2010 +0100
@@ -105,6 +105,7 @@
 		
 		if (err != KErrNone)
 			{
+			DP1("err=%d", err);
 			Panic(EPodcatcherPanicDB);
 			}
 		
@@ -310,6 +311,7 @@
 		BaflUtils::DeleteFile(iFsSession, dbFileName);
 		}
 
+#ifdef ENABLE_MPX_INTEGRATION
 	// copy template to new DB
 	TFileName dbTemplate;
 	TFileName temp;
@@ -317,6 +319,12 @@
 	temp.Copy(iSettingsEngine->PrivatePath());
 	dbTemplate.Append(temp);
 	dbTemplate.Append(KDBTemplateFileName);
+# else
+	// copy template to new DB
+	TFileName dbTemplate;
+	dbTemplate.Copy(iSettingsEngine->PrivatePath());
+	dbTemplate.Append(KDBTemplateFileName);
+#endif
 	
 	DP1("Copy template DB from: %S", &dbTemplate);
 	DP1("Copy template DB to: %S", &dbFileName);
@@ -340,7 +348,8 @@
 	TFileName dbFileName;
 	dbFileName.Copy(iSettingsEngine->PrivatePath());
 	dbFileName.Append(KDBFileName);
-		
+	
+	DP1("dbFileName=%S", &dbFileName);
 	if (!BaflUtils::FileExists(iFsSession, dbFileName))
 		{
 		User::Leave(KErrNotFound);
diff -r 03285b1fc18d -r cf3842290671 engine/src/SettingsEngine.cpp
--- a/engine/src/SettingsEngine.cpp	Sat Oct 23 16:38:32 2010 +0100
+++ b/engine/src/SettingsEngine.cpp	Sat Oct 23 18:22:27 2010 +0100
@@ -205,7 +205,9 @@
 	{
 	TFileName defaultFeeds;
 	TFileName temp;
+#ifdef ENABLE_MPX_INTEGRATION
 	defaultFeeds.Copy(_L("z:"));
+#endif
 	temp.Append(PrivatePath());
 	temp.Append(KDefaultFeedsFile);
 	defaultFeeds.Append(temp);