# HG changeset patch
# User teknolog
# Date 1267132118 0
# Node ID 93d9f66bf50b0a8597713c30e9a3ec9ed791750a
# Parent  4e75731546eba0a8b8d85378f15b24eab1152217
Cleaning description better for second line in search results

diff -r 4e75731546eb -r 93d9f66bf50b application/sis/podcatcher_udeb.pkg
--- a/application/sis/podcatcher_udeb.pkg	Thu Feb 25 20:20:46 2010 +0000
+++ b/application/sis/podcatcher_udeb.pkg	Thu Feb 25 21:08:38 2010 +0000
@@ -16,11 +16,11 @@
 "..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
 
 ; configuration and DB
-"../../engine/config/defaultfeeds.xml"-"!:\private\A0009D00\defaultfeeds.xml"
-"../../engine/config/podcatcher.sqlite"-"!:\private\A0009D00\podcatcher.sqlite.template"
+"../../engine/config/defaultfeeds.xml"-"c:\private\A0009D00\defaultfeeds.xml"
+"../../engine/config/podcatcher.sqlite"-"c:\private\A0009D00\podcatcher.sqlite.template"
 
 ; backup
-"./backup_registration.xml" - "!:\private\A0009D00\backup_registration.xml"
+"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
 
 ; app DLL
 ;"\epoc32\release\gcce\udeb\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
diff -r 4e75731546eb -r 93d9f66bf50b application/sis/podcatcher_udeb.sis
Binary file application/sis/podcatcher_udeb.sis has changed
diff -r 4e75731546eb -r 93d9f66bf50b application/sis/podcatcher_udeb_signed.sis
Binary file application/sis/podcatcher_udeb_signed.sis has changed
diff -r 4e75731546eb -r 93d9f66bf50b application/sis/podcatcher_urel.pkg
--- a/application/sis/podcatcher_urel.pkg	Thu Feb 25 20:20:46 2010 +0000
+++ b/application/sis/podcatcher_urel.pkg	Thu Feb 25 21:08:38 2010 +0000
@@ -16,11 +16,11 @@
 "..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
 
 ; configuration and DB
-"../../engine/config/defaultfeeds.xml"-"!:\private\A0009D00\defaultfeeds.xml"
-"../../engine/config/podcatcher.sqlite"-"!:\private\A0009D00\podcatcher.sqlite.template"
+"../../engine/config/defaultfeeds.xml"-"c:\private\A0009D00\defaultfeeds.xml"
+"../../engine/config/podcatcher.sqlite"-"c:\private\A0009D00\podcatcher.sqlite.template"
 
 ; backup
-"./backup_registration.xml" - "!:\private\A0009D00\backup_registration.xml"
+"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
 
 ; app DLL
 ;"\epoc32\release\gcce\urel\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
diff -r 4e75731546eb -r 93d9f66bf50b application/sis/podcatcher_urel.sis
Binary file application/sis/podcatcher_urel.sis has changed
diff -r 4e75731546eb -r 93d9f66bf50b application/sis/podcatcher_urel_signed.sis
Binary file application/sis/podcatcher_urel_signed.sis has changed
diff -r 4e75731546eb -r 93d9f66bf50b application/src/PodcastSearchView.cpp
--- a/application/src/PodcastSearchView.cpp	Thu Feb 25 20:20:46 2010 +0000
+++ b/application/src/PodcastSearchView.cpp	Thu Feb 25 21:08:38 2010 +0000
@@ -195,7 +195,7 @@
 			
 			TBuf<512> descr;
 			descr.Copy(fi->Description().Left(512));
-			
+			PodcastUtils::RemoveAllFormatting(descr);
 			iListboxFormatbuffer.Format(KSearchResultFormat(), iconIndex, &fi->Title(), &descr);
 			iItemArray->AppendL(iListboxFormatbuffer);
 			iListContainer->Listbox()->ItemDrawer()->SetPropertiesL(i, itemProps);
diff -r 4e75731546eb -r 93d9f66bf50b engine/inc/PodcastUtils.h
--- a/engine/inc/PodcastUtils.h	Thu Feb 25 20:20:46 2010 +0000
+++ b/engine/inc/PodcastUtils.h	Thu Feb 25 21:08:38 2010 +0000
@@ -36,6 +36,7 @@
 	IMPORT_C static void FileNameFromUrl(const TDesC &aUrl, TFileName &aFileName);
 	IMPORT_C static void SQLEncode(TDes &aString);
 	IMPORT_C static void XMLEncode(TDes &aString);
+	IMPORT_C static void RemoveAllFormatting(TDes & aString);
 };
 
 #endif /* PODCASTUTILS_H_ */
diff -r 4e75731546eb -r 93d9f66bf50b engine/src/PodcastUtils.cpp
--- a/engine/src/PodcastUtils.cpp	Thu Feb 25 20:20:46 2010 +0000
+++ b/engine/src/PodcastUtils.cpp	Thu Feb 25 21:08:38 2010 +0000
@@ -126,6 +126,16 @@
 	CleanupStack::PopAndDestroy(tmpBuf);
 }
 
+EXPORT_C void PodcastUtils::RemoveAllFormatting(TDes & aString)
+	{
+	// check for combination first so we prevent adding two spaces 
+	ReplaceString(aString,_L("\r\n"), _L(" "));
+	
+	ReplaceString(aString,_L("\n"), _L(" "));
+	ReplaceString(aString,_L("\r"), _L(" "));
+	
+	}
+
 EXPORT_C void PodcastUtils::ReplaceString(TDes & aString, const TDesC& aStringToReplace, const TDesC& aReplacement)
 	{
 	TInt pos=aString.Find(aStringToReplace);
diff -r 4e75731546eb -r 93d9f66bf50b engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp	Thu Feb 25 20:20:46 2010 +0000
+++ b/engine/src/ShowEngine.cpp	Thu Feb 25 21:08:38 2010 +0000
@@ -271,7 +271,6 @@
 	if (iShowDownloading != NULL)
 		{
 		DP1("CShowEngine::Complete\tDownload of file: %S is complete", &iShowDownloading->FileName());		
-		// decide what kind of file this is		
 		if(aError != KErrCouldNotConnect)
 			{
 			if(aError == KErrDisconnected && iPodcastModel.SettingsEngine().DownloadSuspended())
@@ -303,7 +302,7 @@
 				DBRemoveDownload(iShowDownloading->Uid());
 				AddShowToMpxCollection(*iShowDownloading);				
 				NotifyShowFinishedL(aError);
-
+				iDownloadErrors = 0;
 				delete iShowDownloading;
 				iShowDownloading = NULL;
 				}