# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1289649191 0
# Node ID a648d7ca5e27845d2b77653a4e8f7fbb26bd4237
# Parent  3e12d343ea30768ca478ee4be5709705ed2da581
Small fixes after merge with Symbian1

diff -r 3e12d343ea30 -r a648d7ca5e27 application/inc/PodcastListView.h
--- a/application/inc/PodcastListView.h	Fri Nov 12 21:54:34 2010 +0000
+++ b/application/inc/PodcastListView.h	Sat Nov 13 11:53:11 2010 +0000
@@ -168,7 +168,7 @@
 		 
 		 CAknToolbar *iToolbar;
 		 CAknWaitDialog *iWaitDialog;
-		 TBool flipFlop;
+
     };
 #endif // PODCASTBASEVIEWH
 
diff -r 3e12d343ea30 -r a648d7ca5e27 application/src/PodcastFeedView.cpp
--- a/application/src/PodcastFeedView.cpp	Fri Nov 12 21:54:34 2010 +0000
+++ b/application/src/PodcastFeedView.cpp	Sat Nov 13 11:53:11 2010 +0000
@@ -42,7 +42,6 @@
 #define KMaxTitleLength 100
 
 _LIT(KFeedFormatPortrait, "%d\t%S\t%S%S");
-//_LIT(KFeedFormatPortrait, "%d\t%S");
 _LIT(KFeedFormatLandscape, "%d\t%S");
 enum 
 {
@@ -236,7 +235,6 @@
 			TInt index = iListContainer->Listbox()->CurrentItemIndex();
 			sortedItems = &iPodcastModel.FeedEngine().GetSortedFeeds();
 
-			DP1("Desc: %S",&((*sortedItems)[index]->Description().Left(30)));
 			if(index >= 0 && index < sortedItems->Count())
 				{
 				iPodcastModel.SetActiveFeedInfo((*sortedItems)[index]);			
@@ -395,6 +393,7 @@
 		}
 	
 	iconIndex = iFeedIdForIconArray.Find(aFeedInfo.Uid());
+	DP1("    iconIndex = %d", iconIndex);
 	if(iconIndex == KErrNotFound && aFeedInfo.FeedIcon() != NULL && aFeedInfo.ImageFileName().Length() > 0 && 
 			aFeedInfo.FeedIcon()->SizeInPixels().iHeight > 0 &&
 			aFeedInfo.FeedIcon()->SizeInPixels().iWidth > 0)
@@ -496,7 +495,6 @@
 			iItemArray->Delete(iItemArray->Count() - 1);
 			iItemArrayShort->Delete(iItemArray->Count() - 1);		
 			}
-		//iListContainer->Listbox()->
 		iUpdater->StartUpdate(nbrItems);
 		}
 	else
diff -r 3e12d343ea30 -r a648d7ca5e27 application/src/PodcastListView.cpp
--- a/application/src/PodcastListView.cpp	Fri Nov 12 21:54:34 2010 +0000
+++ b/application/src/PodcastListView.cpp	Sat Nov 13 11:53:11 2010 +0000
@@ -302,6 +302,8 @@
     	delete iListContainer;
     	}
          
+    iItemArray->Reset();
+    iItemArrayShort->Reset();
     delete iItemArray;
     delete iItemArrayShort;
     iItemIdArray.Close();
diff -r 3e12d343ea30 -r a648d7ca5e27 engine/config/testfeeds.xml
--- a/engine/config/testfeeds.xml	Fri Nov 12 21:54:34 2010 +0000
+++ b/engine/config/testfeeds.xml	Sat Nov 13 11:53:11 2010 +0000
@@ -14,6 +14,7 @@
   <outline xmlUrl="www.3sat.de/neues/podcast/podcast.xml"/>
   <outline xmlUrl="http://podkast.nrk.no/program/radioresepsjonen.rss"/>
   <outline xmlUrl="http://www.europe1.fr/rss_export/feed/revue-de-presque-nicolas-canteloup"/>
+  <outline xmlUrl="http://feeds.feedburner.com/rapaduracast"/>
  
 <!-- previously broken feeds, uncomment for regression testing -->
   <outline xmlUrl="http://www.cnet.com/i/pod/cnet_buzz.xml"/>
diff -r 3e12d343ea30 -r a648d7ca5e27 engine/src/HttpClient.cpp
--- a/engine/src/HttpClient.cpp	Fri Nov 12 21:54:34 2010 +0000
+++ b/engine/src/HttpClient.cpp	Sat Nov 13 11:53:11 2010 +0000
@@ -205,6 +205,10 @@
 		{
 		return EFalse;
 		}
+
+	DP1("Getting URL: %S", &aUrl);
+	DP1("Writing file: %S", &aFileName);
+
 	iCurrentURL.Copy(aUrl);	
 		
 	TInt urlError = iUriParser.Parse(iCurrentURL);
@@ -262,7 +266,7 @@
 	}
 
 void CHttpClient::ClientRequestCompleteL(TInt aErrorCode) {
-	DP1("CHttpClient::ClientRequestCompleteL, aErrorCode=%d", aErrorCode);
+	DP1("CHttpClient::ClientRequestCompleteL BEGIN, aErrorCode=%d", aErrorCode);
 	iIsActive = EFalse;
 	iObserver.CompleteL(this, aErrorCode);
 	DP1("    iTransactionCount=%d", iTransactionCount);
@@ -278,4 +282,5 @@
 			iSession.Close();
 			}
 		}
+	DP("CHttpClient::ClientRequestCompleteL END");
 }
diff -r 3e12d343ea30 -r a648d7ca5e27 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Fri Nov 12 21:54:34 2010 +0000
+++ b/engine/src/PodcastModel.cpp	Sat Nov 13 11:53:11 2010 +0000
@@ -105,7 +105,6 @@
 		
 		if (err != KErrNone)
 			{
-			DP1("err=%d", err);
 			Panic(EPodcatcherPanicDB);
 			}