diff -r 7d91903f795f -r ce5ada96ab30 mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwView.cpp
--- a/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwView.cpp	Fri Feb 19 22:52:52 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwView.cpp	Fri Mar 12 15:43:00 2010 +0200
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 6 %
+// Version : %version: 8 %
 
 
 
@@ -41,8 +41,11 @@
 // might leave.
 // -----------------------------------------------------------------------------
 //
-CMPSettingsAdvancedBwView::CMPSettingsAdvancedBwView(CMPSettingsModelForROP* aModel, TBool iConstructAsGsPlugin) 
-    : iModel( aModel), iGsPlugin(iConstructAsGsPlugin)
+CMPSettingsAdvancedBwView::CMPSettingsAdvancedBwView( 
+        CMPSettingsModelForROP* aModel,
+        TBool iConstructAsGsPlugin ) 
+    : iModel( aModel), 
+      iGsPlugin(iConstructAsGsPlugin)
     {
     MPX_FUNC("#MS# CMPSettingsAdvancedBwView::CMPSettingsAdvancedBwView()");
     }
@@ -63,7 +66,9 @@
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
-CMPSettingsAdvancedBwView* CMPSettingsAdvancedBwView::NewLC(CMPSettingsModelForROP* aModel, TBool iConstructAsGsPlugin)
+CMPSettingsAdvancedBwView* CMPSettingsAdvancedBwView::NewLC(
+        CMPSettingsModelForROP* aModel, 
+        TBool iConstructAsGsPlugin )
     {
     MPX_DEBUG2(_L("#MS# CMPSettingsAdvancedBwView::NewLC(%d)"),iConstructAsGsPlugin);
     CMPSettingsAdvancedBwView* self = new(ELeave) CMPSettingsAdvancedBwView(aModel,iConstructAsGsPlugin);
@@ -107,13 +112,13 @@
             static_cast<CMPSettingsAdvancedBwContainer*>(iContainer)->EditCurrentItemFromMenuL();
             break;
         case EAknSoftkeyBack:
-            AppUi()->ActivateLocalViewL(KMPSettNetworkViewId);
+            AppUi()->ActivateLocalViewL( KMPSettStreamingViewId );
             break;
         case EMPSettCmdHelp:
             if( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-            {
+                {
                 HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), AppUi()->AppHelpContextL() );
-            }
+                }
             break;
         default:
             AppUi()->HandleCommandL(aCommand);
@@ -139,10 +144,10 @@
 void CMPSettingsAdvancedBwView::SetNaviPaneL()
     {
     MPX_FUNC("#MS# CMPSettingsAdvancedBwView::SetNaviPaneL()");
-        if (!iGsPlugin)
+    if (!iGsPlugin)
         {
-            iNaviPaneContext = NULL;
-            CMPSettingsBaseView::SetNaviPaneL();
+        iNaviPaneContext = NULL;
+        CMPSettingsBaseView::SetNaviPaneL();
         }
     CMPSettingsBaseView::SetMiddleSoftKeyLabelL(R_MEDIASETTING_MSK_CHANGE,EMPSettCmdChange);
     }