--- a/application/src/PodcastSettingsView.cpp	Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastSettingsView.cpp	Thu May 13 13:56:05 2010 +0100
@@ -381,32 +381,26 @@
 			case EPodcastSettingShowDir:
 				DP("EPodcastSettingShowDir");
 				return new (ELeave) CAknTextSettingItem(aSettingId, iShowDir);
-				break;
 			case EPodcastSettingAutoUpdate:
 				DP("EPodcastSettingAutoUpdate");
 				iSettingAutoUpdate = new (ELeave) CAknEnumeratedTextPopupSettingItem(aSettingId, iAutoUpdate);
 				return iSettingAutoUpdate;
-				break;
 			case EPodcastSettingConnection:
 				DP("EPodcastSettingConnection");
 				return new (ELeave) CConnectionSetting (aSettingId, iConnection, iPodcastModel);
-				break;
 			case EPodcastSettingIAPList:
 				DP("EPodcastSettingIAPList");
 				iSettingIAP = new (ELeave) CIapSetting (aSettingId, iIap, iPodcastModel);
 				return iSettingIAP;
-				break;
 			case EPodcastSettingAutoDownload:
 				DP("EPodcastSettingAutoDownload");
 				iSettingAutoDownload = new (ELeave) CAknBinaryPopupSettingItem (aSettingId, iAutoDownload);
 				return iSettingAutoDownload;
-				break;
 			default:
 				return CAknSettingItemList::CreateSettingItemL(aSettingId);
-				break;
 			}
-		DP("CreateSettingItemL END");
-		return NULL;	
+		//DP("CreateSettingItemL END");
+		//return NULL;
 		}
 	
 	TFileName iShowDir;
@@ -543,6 +537,7 @@
 		}
 		break;
 	case EPodcastResetDb:
+		{
 		CAknQueryDialog* dlg= new(ELeave) CAknQueryDialog();
 		
 		CleanupStack::PushL(dlg);
@@ -555,9 +550,12 @@
 			iPodcastModel.DropDB();
 			AppUi()->Exit();
 			}
+		}
 		break;
 	default:
+		{
 		AppUi()->HandleCommandL(aCommand);
+		}
 		break;
 	}
 }