--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Data/GSPowerSavingQueryPluginRsc.rss	Tue Jan 26 12:09:08 2010 +0200
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Data/GSPowerSavingQueryPluginRsc.rss	Tue Feb 02 00:22:03 2010 +0200
@@ -92,10 +92,31 @@
 //
 RESOURCE AVKON_VIEW r_gs_power_saving_query_view
     {
-    menubar = r_gs_menubar_change_exit;
+    menubar = r_gs_powersavingquery_menubar;
     cba = R_GS_SOFTKEYS_OPTIONS_BACK_CHANGE;
     }
 
+// -----------------------------------------------------------------------------
+//
+// r_gs_powersavingquery_menubar
+// GS_Powersavingquery_Plugin menu with 'change' and 'exit' items without help.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_BAR r_gs_powersavingquery_menubar
+    {
+    titles =
+        {
+        MENU_TITLE
+            {
+            menu_pane = r_gs_menu_item_exit;
+            },
+        MENU_TITLE
+            {
+            menu_pane = r_gs_menu_item_change;
+            }
+        };
+    }
 
 //----------------------------------------------------
 //

--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Inc/GSPowerSavingQueryPlugin.h	Tue Jan 26 12:09:08 2010 +0200
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Inc/GSPowerSavingQueryPlugin.h	Tue Feb 02 00:22:03 2010 +0200
@@ -121,10 +121,6 @@
         */
         CGSPowerSavingQueryPluginContainer* Container();
 
-    protected: // From MEikMenuObserver
-
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
     protected:
 
         /**

--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Inc/GSPowerSavingQueryPluginContainer.h	Tue Jan 26 12:09:08 2010 +0200
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Inc/GSPowerSavingQueryPluginContainer.h	Tue Feb 02 00:22:03 2010 +0200
@@ -81,13 +81,6 @@
          */
         void MakePowerSavingQueryItemL();
     
-    private:
-        /**
-        * Required for help.
-        * 
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-    
     private: // data
         //Listbox item array model
         CGSListBoxItemTextArray* iListboxItemArray;

--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPlugin.cpp	Tue Jan 26 12:09:08 2010 +0200
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPlugin.cpp	Tue Feb 02 00:22:03 2010 +0200
@@ -200,15 +200,6 @@
         case EAknSoftkeyBack:
             iAppUi->ActivateLocalViewL( KGSDeviceManagementPluginUid );
             break;
-        case EAknCmdHelp:
-            {
-            if( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-                {
-                HlpLauncher::LaunchHelpApplicationL(
-                    iEikonEnv->WsSession(), iAppUi->AppHelpContextL() );
-                }
-            break;
-            }
         default:
             iAppUi->HandleCommandL( aCommand );
             break;
@@ -372,24 +363,6 @@
   
     }
 
-
-// -----------------------------------------------------------------------------
-// CGSPowerSavingQueryPlugin::DynInitMenuPaneL()
-//
-// dynamically handle help item if not supported
-// -----------------------------------------------------------------------------
-//
-void CGSPowerSavingQueryPlugin::DynInitMenuPaneL( TInt aResourceId, 
-                                          CEikMenuPane* aMenuPane )
-    {   
-    if( aResourceId == R_GS_MENU_ITEM_HELP )
-        {
-        User::LeaveIfNull( aMenuPane );
-        
-        aMenuPane->SetItemDimmed( EAknCmdHelp, 
-                !FeatureManager::FeatureSupported( KFeatureIdHelp ) );
-        }
-    }
 // -----------------------------------------------------------------------------
 // CGSPowerSavingQueryPlugin::SwitchOnOffValue()
 //

--- a/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPluginContainer.cpp	Tue Jan 26 12:09:08 2010 +0200
+++ b/gssettingsuis/Gs/GSPowerSavingQueryPlugin/Src/GSPowerSavingQueryPluginContainer.cpp	Tue Feb 02 00:22:03 2010 +0200
@@ -156,18 +156,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// CGSPowerSavingQueryPluginContainer::GetHelpContext() const
-//  
-// Gets Help 
-// ---------------------------------------------------------------------------
-//
-void CGSPowerSavingQueryPluginContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-      aContext.iMajor = KUidGS;
-  //  aContext.iContext = 0;
-    }
-
-// ---------------------------------------------------------------------------
 // CGSPowerSavingQueryPluginContainer::CurrentFeatureId()
 //
 // Return the feature id of selected listitem