Revision: 200937 PDK_3.0.a
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 24 Sep 2009 12:40:29 +0300
changeset 11 16a119033e3e
parent 10 4530440261a8
child 12 fcd4366c1e85
child 15 d6f226a5ad2c
Revision: 200937 Kit: 200939
browserplugins/browseraudiovideoplugin/src/BavpView.cpp
browserui/browser/BrowserAppInc/BrowserContentView.h
browserui/browser/BrowserAppInc/BrowserPreferences.h
browserui/browser/BrowserAppInc/BrowserPreferences.inl
browserui/browser/BrowserAppInc/Preferences.h
browserui/browser/BrowserAppSrc/BrowserAppUi.cpp
browserui/browser/BrowserAppSrc/BrowserContentView.cpp
browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp
browserui/browser/BrowserAppSrc/BrowserDisplay.cpp
browserui/browser/BrowserAppSrc/BrowserPreferences.cpp
browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp
browserui/browser/BrowserAppSrc/BrowserWindow.cpp
browserui/browser/FavouritesInc/BrowserFavouritesSelectionState.h
browserui/browser/FavouritesInc/BrowserFavouritesSelectionState.inl
browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp
browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp
browserui/browser/FeedsSrc/FeedsEditFolderDialog.cpp
browserui/browser/FeedsSrc/FeedsFolderContainer.cpp
browserui/browser/FeedsSrc/FeedsFolderView.cpp
browserui/browser/SrcData/Feeds.rssi
browserui/browser/conf/browserui.confml
browserui/browser/conf/browserui_10008D39.crml
browserui/browser/help/data/xhtml.zip
browserui/browser/help/group/bld.inf
browserui/browser/help/inc/browser.hlp.hrh
browserui/browser/help/rom/browseruihelps_variant.iby
browserui/operatormenu/help/data/xhtml.zip
browserui/operatormenu/help/group/bld.inf
browserui/operatormenu/help/inc/ope.hlp.hrh
browserui/operatormenu/help/rom/operatormenuhelps_variant.iby
pushmtm/help/data/xhtml.zip
pushmtm/help/group/bld.inf
pushmtm/help/inc/wpush.hlp.hrh
pushmtm/help/rom/pushmtmhelps_variant.iby
--- a/browserplugins/browseraudiovideoplugin/src/BavpView.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserplugins/browseraudiovideoplugin/src/BavpView.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -606,6 +606,7 @@
         gc.Clear( aRect );
         }
     
+        if (iBavpController->IsClipLocalMedia() && iBavpController->IsClipSeekable()) {
         if (iBavpController->State() == EBavpPlayComplete) {
           TRAP_IGNORE(iBavpController->setPositionL(iBavpController->Duration()));
         }
@@ -613,7 +614,7 @@
           TRAP_IGNORE(iBavpController->setPositionL(iBavpController->getPositionL()));
         }
     }
-    
+        }        
         
     }
 
--- a/browserui/browser/BrowserAppInc/BrowserContentView.h	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserContentView.h	Thu Sep 24 12:40:29 2009 +0300
@@ -700,6 +700,7 @@
         TBool iOptionsMenuActive;
         CPeriodic *iAutoFSPeriodic;
         CPeriodic *iIdlePeriodic;
+        TBool iFullScreenBeforeEditModeEntry;
 
     };
 
--- a/browserui/browser/BrowserAppInc/BrowserPreferences.h	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserPreferences.h	Thu Sep 24 12:40:29 2009 +0300
@@ -969,7 +969,11 @@
         * To get Service Feature Flag.
         */
         inline TInt ServiceFeature() const;
-
+		
+        /** 
+        * To get cursor show mode
+        */
+        inline TBrCtlDefs::TCursorSettings CursorShowMode() const;
     private:
 
         /**
--- a/browserui/browser/BrowserAppInc/BrowserPreferences.inl	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserPreferences.inl	Thu Sep 24 12:40:29 2009 +0300
@@ -635,6 +635,16 @@
     return iAllPreferences.iZoomLevelDefault;
     }    
     
+
+// ---------------------------------------------------------
+// CBrowserPreferences::CursorShowMode()
+// ---------------------------------------------------------
+//
+TBrCtlDefs::TCursorSettings CBrowserPreferences::CursorShowMode() const
+    {
+    return iAllPreferences.iCursorShowMode;
+    }   
+ 
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::URLSuffixList
 // ----------------------------------------------------------------------------
--- a/browserui/browser/BrowserAppInc/Preferences.h	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppInc/Preferences.h	Thu Sep 24 12:40:29 2009 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *      Interface for Preferences handling.
 *
 *
@@ -83,7 +83,7 @@
     TWmlSettingsAdaptiveBookmarks   iAdaptiveBookmarks;
     TWmlSettingsHomePage            iHomePgType;
     TBool                           iHTTPSecuritySupressed;
-    TBool                           iDownloadsOpen;    
+    TBool                           iDownloadsOpen;
     TBool                           iConnDialogs;
     TBool                           iHttpSecurityWarnings;
     TInt                            iMediaVolume;
@@ -116,17 +116,17 @@
     TInt                            iToolbarButton6Cmd;     // see Toolbar Button Command List for cenrep values
     TInt                            iToolbarButton7Cmd;     // see Toolbar Button Command List for cenrep values
 	TInt							iShortcutKeysForQwerty;
-	TInt 							iShortcutKey1Cmd;    
-	TInt 							iShortcutKey2Cmd;    
-	TInt 							iShortcutKey3Cmd;    
-	TInt 							iShortcutKey4Cmd;    
-	TInt 							iShortcutKey5Cmd;    
-	TInt 							iShortcutKey6Cmd;    
-	TInt 							iShortcutKey7Cmd;    
-	TInt 							iShortcutKey8Cmd;    
-	TInt 							iShortcutKey9Cmd;    
-	TInt 							iShortcutKey0Cmd;    
-	TInt 							iShortcutKeyStarCmd;    
+	TInt 							iShortcutKey1Cmd;
+	TInt 							iShortcutKey2Cmd;
+	TInt 							iShortcutKey3Cmd;
+	TInt 							iShortcutKey4Cmd;
+	TInt 							iShortcutKey5Cmd;
+	TInt 							iShortcutKey6Cmd;
+	TInt 							iShortcutKey7Cmd;
+	TInt 							iShortcutKey8Cmd;
+	TInt 							iShortcutKey9Cmd;
+	TInt 							iShortcutKey0Cmd;
+	TInt 							iShortcutKeyStarCmd;
 	TInt 							iShortcutKeyHashCmd;
 	TUint32							iScriptLog;
 	// Minimum, Maximum and Default (for new page) Zoom Level settings
@@ -136,12 +136,13 @@
 	TInt							iMaxRecentUrlsToShow;
     TBool                           iSearch;                // Search Feature
     TBool                           iService;               // Service Feature
+    TBrCtlDefs::TCursorSettings     iCursorShowMode;
     };
 
 /**
 *   Helper enum for MPreferencesObserver
 */
-enum TPreferencesEvent 
+enum TPreferencesEvent
     {
 	EPreferencesActivate,   // Preferences opened
 	EPreferencesDeactivate, // Preferences closed
@@ -159,12 +160,12 @@
         /**
         * Derived classes should implement this method, and act accordingly.
         */
-		virtual void HandlePreferencesChangeL( 
+		virtual void HandlePreferencesChangeL(
 	                            const TPreferencesEvent aEvent,
                                 TPreferencesValues& aValues,
                                 TBrCtlDefs::TBrCtlSettings aSettingType ) = 0;
 	};
-	
+
 //=============================================================================
 
 /**
@@ -178,37 +179,37 @@
         * To read all of the preferences in one go
         */
         virtual const TPreferencesValues& AllPreferencesL() = 0;
-        
+
         /**
         * To access embedded mode
         */
         virtual TBool EmbeddedMode() const = 0;
-        
+
         /**
 		* To access DefaultAccessPoint setting
         */
 		virtual TUint DefaultAccessPoint() const = 0;
-		
-	
+
+
 		/**
 		* To access DefaultSnapId setting
         */
 
 		virtual TUint DefaultSnapId() const = 0;
-		
+
         /**
         * To access deafult AP details if exist setting.
-        */         
-        virtual CApAccessPointItem* DefaultAPDetails() = 0;		
-		
+        */
+        virtual CApAccessPointItem* DefaultAPDetails() = 0;
+
 		/**
 		* To access Associated VPN Ap if exist
 		*/
 		virtual TUint AssociatedVpn() const = 0;
-		
+
 		/**
 		* Get the vpn item if it is vpn
-		*/		
+		*/
 		virtual TBool VpnDataL( TUint aDefaultAccessPoint, CVpnApItem& aVpnItem ) = 0;
 
         /**
@@ -220,44 +221,44 @@
 		* To access PageOverview setting
         */
 		virtual TBool PageOverview() const = 0;
-		
+
 		/**
 		* To access BackList setting
         */
 		virtual TBool BackList() const = 0;
-		
+
 		/**
 		* To access AutoRefresh setting
         */
 		virtual TBool AutoRefresh() const = 0;
-		
+
 		/*
-        * Sets the automatic updating access point of Web Feeds 
+        * Sets the automatic updating access point of Web Feeds
         */
         virtual void SetAutomaticUpdatingApL( TUint aSetting ) = 0;
 		/*
-        * Sets the automatic updating while roaming of News & Blogs 
+        * Sets the automatic updating while roaming of News & Blogs
         */
         virtual void SetAutomaticUpdatingWhileRoamingL( TBool aAutoUpdateRoaming ) = 0;
-        
+
         /**
         * To modify user-defined URL suffix list (.com, .org, .net)
         */
         virtual void SetURLSuffixList( HBufC* aValue ) = 0;
-        
+
 		/**
 		* To access user-defined URL suffix list (.com, org, .net)
         */
         virtual HBufC* URLSuffixList( ) const = 0;
         /**
-        * automatic updating access point of Web Feeds 
+        * automatic updating access point of Web Feeds
         */
         virtual TUint AutomaticUpdatingAP() const = 0;
         /**
-        * automatic updating while roaming of News & Blogs 
+        * automatic updating while roaming of News & Blogs
         */
         virtual TBool AutomaticUpdatingWhileRoaming() const = 0;
-        
+
         /**
 		* To access TextWrap setting
         @ return setting item value
@@ -318,7 +319,7 @@
 		* To access Downloads Open setting
         */
 		virtual TBool DownloadsOpen() const = 0;
-		     
+
 		/**
 		* To access user-defined homepage URL setting
         */
@@ -380,7 +381,7 @@
         * To access Form Data Saving setting
         */
         virtual TWmlSettingsFormData FormDataSaving() const = 0;
-        
+
         /**
         * To access Access Keys setting : Enabled/Disabled
         */
@@ -390,11 +391,11 @@
 		* To modify DefaultAccessPoint setting
         */
 		virtual void SetDefaultAccessPointL( TUint aDefaultAccessPoint, TUint aAssocVpn = KWmlNoDefaultAccessPoint  ) = 0;
-		
+
 		/**
 		* To modify DefaultSnapId setting
         */
-		virtual void SetDefaultSnapId (TUint aSnapId) = 0;		
+		virtual void SetDefaultSnapId (TUint aSnapId) = 0;
 
         /**
 		* To modify AutoLoadContent setting
@@ -405,12 +406,12 @@
 		* To modify PageOverview setting
         */
 		virtual void SetPageOverviewL( TBool aPageOverview ) = 0;
-		
+
 		/**
 		* To modify BackList setting
         */
 		virtual void SetBackListL( TBool aBackList ) = 0;
-		
+
 		/**
 		* To modify AutoRefresh setting
         */
@@ -504,7 +505,7 @@
 
 	    /**
 	    * To access Default Access Point selection mode settings.
-        */        
+        */
         virtual TCmSettingSelectionMode AccessPointSelectionMode() = 0;
 
         /**
@@ -516,7 +517,7 @@
         * To modify Popup Blocking Enabled settign
         */
         virtual void SetPopupBlockingL( TBool aPopupBlocking ) = 0;
-        
+
         /**
         * To modify Form Data Saving setting
         */
@@ -581,242 +582,242 @@
         * To get value of Rotate Display setting
         */
         virtual TBool RotateDisplay() const = 0;
-    
-        /** 
+
+        /**
         * To get Toolbar On/Off value
         */
         virtual TInt ShowToolbarOnOff() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar On/Off value
         */
         virtual void SetToolbarOnOffL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Toolbar Button 1 command value
         */
         virtual TInt ShowToolbarButton1Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 1 command value
         */
         virtual void SetToolbarButton1CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Toolbar Button 2 command value
         */
         virtual TInt ShowToolbarButton2Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 2 command value
         */
         virtual void SetToolbarButton2CmdL(TInt aCommand) = 0;
-        
-        /** 
+
+        /**
         * To get Toolbar Button 3 command value
         */
         virtual TInt ShowToolbarButton3Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 3 command value
         */
         virtual void SetToolbarButton3CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Toolbar Button 4 command value
         */
         virtual TInt ShowToolbarButton4Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 4 command value
         */
         virtual void SetToolbarButton4CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Toolbar Button 5 command value
         */
         virtual TInt ShowToolbarButton5Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 5 command value
         */
         virtual void SetToolbarButton5CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Toolbar Button 6 command value
         */
         virtual TInt ShowToolbarButton6Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 6 command value
         */
         virtual void SetToolbarButton6CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Toolbar Button 7 command value
         */
         virtual TInt ShowToolbarButton7Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Toolbar Button 7 command value
         */
         virtual void SetToolbarButton7CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 1 command value
         */
         virtual TInt ShortcutKey1Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 1 command value
         */
         virtual void SetShortcutKey1CmdL(TInt aCommand) = 0;
- 
-         /** 
+
+         /**
         * To get Shortcut Key 2 command value
         */
         virtual TInt ShortcutKey2Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 2 command value
         */
         virtual void SetShortcutKey2CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 3 command value
         */
         virtual TInt ShortcutKey3Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 3 command value
         */
         virtual void SetShortcutKey3CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 4 command value
         */
         virtual TInt ShortcutKey4Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 4 command value
         */
         virtual void SetShortcutKey4CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 5 command value
         */
         virtual TInt ShortcutKey5Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 5 command value
         */
         virtual void SetShortcutKey5CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 6 command value
         */
         virtual TInt ShortcutKey6Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 6 command value
         */
         virtual void SetShortcutKey6CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 7 command value
         */
         virtual TInt ShortcutKey7Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 7 command value
         */
         virtual void SetShortcutKey7CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 8 command value
         */
         virtual TInt ShortcutKey8Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 8 command value
         */
         virtual void SetShortcutKey8CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 9 command value
         */
         virtual TInt ShortcutKey9Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 9 command value
         */
         virtual void SetShortcutKey9CmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key 0 command value
         */
         virtual TInt ShortcutKey0Cmd() const = 0;
-       
-        /** 
+
+        /**
         * To set Shortcut Key 0 command value
         */
         virtual void SetShortcutKey0CmdL(TInt aCommand) = 0;
-        
-        /** 
+
+        /**
         * To get Shortcut Key Star command value
         */
         virtual TInt ShortcutKeyStarCmd() const = 0;
 
-        /** 
+        /**
         * To set Shortcut Key Star command value
         */
         virtual void SetShortcutKeyStarCmdL(TInt aCommand) = 0;
 
-        /** 
+        /**
         * To get Shortcut Key Hash command value
         */
         virtual TInt ShortcutKeyHashCmd() const = 0;
-            
-        /** 
+
+        /**
         * To set Shortcut Key Hash command value
         */
         virtual void SetShortcutKeyHashCmdL(TInt aCommand) = 0;
-        
-        /** 
+
+        /**
         * To get Shortcut Key for Qwerty command value
         */
         virtual TInt ShortcutKeysForQwerty() const = 0;
 
-        /** 
+        /**
         * Zoom Level minimum (percentage) value
         */
         virtual inline TUint32 ZoomLevelMinimum() const = 0;
 
-        /** 
+        /**
         * Zoom Level maximum (percentage) value
         */
         virtual inline TUint32 ZoomLevelMaximum() const = 0;
 
-        /** 
+        /**
         * Zoom Level default (percentage) value
         */
         virtual inline TUint32 ZoomLevelDefault() const = 0;
-        
+
    		/**
 		* Maximum Recent URLs to show
         */
         virtual TInt MaxRecentUrls() const = 0;
 
         /**
-        * Search Feature Enabled or Disabled. 
+        * Search Feature Enabled or Disabled.
         */
         virtual inline TBool SearchFeature() const = 0;
-        
+
         /**
-        * Service Feature Enabled or Disabled. 
+        * Service Feature Enabled or Disabled.
         */
         virtual inline TBool ServiceFeature() const = 0;
-                
+
         /**
         * To access an int value key in ini file
         * @param aKey the ini file key to read
@@ -831,7 +832,12 @@
         */
         virtual TInt GetStringValueL ( TUint32 aKey, TInt aMaxBufSize, TDes& aBuf ) const = 0;
 
-        
+        /**  
+	    * Cursor show mode  
+	    */  
+        virtual TBrCtlDefs::TCursorSettings CursorShowMode() const = 0;  
+
+
     public:     // observer support
 
         /**
@@ -851,11 +857,11 @@
 		* To flush share data key settings
 		*/
 		virtual void FlushSD() = 0;
-		
+
 		virtual void NotifyObserversL( TPreferencesEvent aEvent,
                                     TBrCtlDefs::TBrCtlSettings aSettingType ) = 0;
     };
 
 #endif
-            
+
 // End of File
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -820,6 +820,16 @@
 			BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandIdBase + (TInt)TBrCtlDefs::ECommandOneStepBack );
             break;
             }
+        case EEikCmdEditPaste:
+            {
+            TKeyEvent keyEvent;
+            keyEvent.iCode = EKeyF18;  //member of TKeyCode	
+            keyEvent.iScanCode = EEikCmdEditPaste;	
+            keyEvent.iModifiers = EModifierCtrl;
+            keyEvent.iRepeats = 0;
+            TRAP_IGNORE( BrCtlInterface().OfferKeyEventL(keyEvent, EEventKey));
+            }
+            break;
 	    //=====================================================================
         default:
             {
@@ -3770,9 +3780,18 @@
     {
     CAknAppUi::HandleApplicationSpecificEventL(aEventType, aWsEvent);
 
+    /*
+     * Note:  Even though we get these memory events from the system for handling OOM, and we pass them off
+     * to the command handler, there is no code further down the line that actually handles them (it would 
+     * normally be in BrCtl).  We totally ignore these events.  This is because the system has too high of an OOM threshold.
+     * I.e. the system may only have 6m left and think it's out of memory, however, the browser can still render
+     * many pages in only 6m.  So, these system events are ignored and the browser handles OOM with its own mechanism.
+     * (See OOMStopper and OOMHandler)
+     */
 	if(aEventType == KAppOomMonitor_FreeRam )
 		{
 		iWindowManager->CloseAllWindowsExceptCurrent();
+		// If we were really doing anything about this event, why do we not want to do it to the foreground?
 		if(!iIsForeground)
 		    {
             BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandFreeMemory + (TInt)TBrCtlDefs::ECommandIdBase);
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -137,6 +137,7 @@
     iFindItemIsInProgress = EFalse;
     iWasInFeedsView = EFalse;
     iPenEnabled = AknLayoutUtils::PenEnabled();
+    iFullScreenBeforeEditModeEntry = EFalse;
     }
 
 
@@ -978,6 +979,7 @@
 		{
 		StartAutoFullScreenTimer();
 		}
+    iContainer->SetRect(ClientRect());
 PERFLOG_STOP_WRITE("ContentView::DoActivate")
     }
 
@@ -2278,9 +2280,21 @@
             }
         case TBrCtlDefs::EStateFullscreenBrowsing:
             {
-            if ( !aValue )
+            if (!iPenEnabled && IsEditMode())
                 {
-                TRAP_IGNORE( EnableFullScreenModeL( EFalse ) );
+                if (!aValue)
+                    { // exit fullscreen so remember what to go back to after edit mode is exited
+                    iFullScreenBeforeEditModeEntry = iContentFullScreenMode;
+                    TRAP_IGNORE( EnableFullScreenModeL( EFalse ) );
+                    }
+                else if (aValue && iFullScreenBeforeEditModeEntry)
+                    {
+                    TRAP_IGNORE( EnableFullScreenModeL( ETrue ) );
+                    }
+                }
+            else if (!aValue)
+                {
+                    TRAP_IGNORE( EnableFullScreenModeL( EFalse ) );
                 }
             break;
             }
@@ -2919,17 +2933,15 @@
 // ---------------------------------------------------------------------------
 TInt CBrowserContentView::FindCurrentZoomIndex(TInt aCurrentZoomLevel)
 {
-    TInt aIndex = -1;
-
-    for (aIndex=0; aIndex<iZoomLevelArray->Count()-1; aIndex++)
-    {
-        TInt tmpZoomLevel = (*iZoomLevelArray)[aIndex];
-        if (aCurrentZoomLevel ==(*iZoomLevelArray)[aIndex] )
-        {
-            break;
-        }
-    }
-    return aIndex;
+	TInt index = -1;
+	for ( index = 0; index<iZoomLevelArray->Count()-1; index++)
+	{
+	   if (aCurrentZoomLevel <=(*iZoomLevelArray)[index] )
+		{
+			break;
+		}
+	}
+	return index;
 }
 
 // ---------------------------------------------------------------------------
@@ -3326,7 +3338,10 @@
 	TBrCtlDefs::TBrCtlElementType focusedElementType =
                 ApiProvider().BrCtlInterface().FocusedElementType();
 
-	return  (focusedElementType == TBrCtlDefs:: EElementActivatedInputBox);
+	TBool retVal = ((focusedElementType == TBrCtlDefs:: EElementActivatedInputBox) ||
+                    (focusedElementType == TBrCtlDefs:: EElementInputBox) ||
+                    (focusedElementType == TBrCtlDefs:: EElementTextAreaBox));
+	return  (retVal);
 	}
 
 // End of File
--- a/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -264,12 +264,7 @@
 
         }   // End of handling key events for zooming
 
-    // convert Enter key to KeyOk, this is only for emulator
-    if ( aType == EEventKey &&  keyEvent.iCode == EKeyEnter )
-        {
-        keyEvent.iCode = EKeyOK;
-        }
-
+    
     // Web Engine opens the highlighted link into a new window. (long press)
     // Currently the option is disabled and the link is opened in the same window
     // The commented part below enables the "Open link in new window" option on long press.
--- a/browserui/browser/BrowserAppSrc/BrowserDisplay.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserDisplay.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -274,12 +274,6 @@
             CAknIndicatorContainer* indicContainerEditing = SelectIndicContainerEditing();
             CAknIndicatorContainer* indicContainerOwn = SelectIndicContainerOwn();
 
-            _IND_STATE( FileSize ) = EAknIndicatorStateOff;
-            indicContainerEditing->_SET_INDIC( FileSize );
-            indicContainerOwn->_SET_INDIC( FileSize );
-            indicContainerOwn->SetIndicatorValueL( 
-                TUid::Uid( _AKN_IND( FileSize ) ), KNullDesC() );
-
             if ( Layout_Meta_Data::IsLandscapeOrientation() )
                 { 
                 // Lanscape mode - Title in title pane not navipane/messageinfo
@@ -403,6 +397,13 @@
                 CAknIndicatorContainer* indicContainerEditing = SelectIndicContainerEditing();
                 CAknIndicatorContainer* indicContainerOwn = SelectIndicContainerOwn();
 
+                _IND_STATE( FileSize ) = EAknIndicatorStateOff;
+                indicContainerEditing->_SET_INDIC( FileSize );
+                indicContainerOwn->_SET_INDIC( FileSize );
+
+                indicContainerOwn->SetIndicatorValueL( 
+                TUid::Uid( _AKN_IND( FileSize ) ), KNullDesC() );
+                
                 _IND_STATE( ProgressBar ) = EAknIndicatorStateOff;
                 indicContainerEditing->_SET_INDIC( ProgressBar );
                 indicContainerOwn->_SET_INDIC( ProgressBar );
--- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: 
+* Description:
 *     It manages WmlBrowser's preferences
 *
 *
@@ -83,33 +83,33 @@
     LOG_ENTERFN("CBrowserPreferences::ConstructL");
     iObservers = new ( ELeave ) CArrayPtrFlat< MPreferencesObserver >( 1 );
     iCommsModel.ApDb().AddObserverL( this );
-    	
+
 	iApDH = CApDataHandler::NewLC( iCommsModel.CommsDb() );
 	CleanupStack::Pop();
-	
+
     iVpnEngine = CVpnApEngine::NewLC( &(iCommsModel.CommsDb()) );
-    CleanupStack::Pop();	
-	
+    CleanupStack::Pop();
+
  	CRepository* repository = CRepository::NewL( KCRUidBrowserUiLV );
 
-    if ( repository->Get( 
+    if ( repository->Get(
          KBrowserUiCommonFlags, iEngineLocalFeaturesBitmask ) != KErrNone )
         {
         // in case of problems, assume everything is off
         iEngineLocalFeaturesBitmask = 0;
-        } 
-    if ( repository->Get( 
+        }
+    if ( repository->Get(
         KBrowserUiCommonFlags, iUiLocalFeaturesBitmask ) != KErrNone )
         {
         // in case of problems, assume everything is off
         iUiLocalFeaturesBitmask = 0;
-        } 
-    if ( repository->Get( 
+        }
+    if ( repository->Get(
         KBrowserUiCdmaFlags, iCdmaUiLocalFeaturesBitmask ) != KErrNone )
         {
         // in case of problems, assume everything is off
         iCdmaUiLocalFeaturesBitmask = 0;
-        } 
+        }
 
     delete repository;
 
@@ -127,7 +127,7 @@
 
     //Read ini values to local variables.
     TRAP_IGNORE( RestoreSettingsL() );
-    
+
     // and overwrite some of them if needed
     if ( aSettings )
         {
@@ -144,7 +144,7 @@
 LOG_ENTERFN("CBrowserPreferences::EngineLocalFeatureSupported");
 BROWSER_LOG( ( _L( "EnginLocalFeatureSupported returns %d" ),
         (iEngineLocalFeaturesBitmask & aFeature) ) );
-    return (iEngineLocalFeaturesBitmask & aFeature);    
+    return (iEngineLocalFeaturesBitmask & aFeature);
     }
 
 // ----------------------------------------------------------------------------
@@ -173,7 +173,7 @@
 	CBrowserPreferences* result;
 	result = new ( ELeave ) CBrowserPreferences( aCommsModel, aApiProvider );
 	CleanupStack::PushL( result );
-	result->ConstructL( aSettings );	
+	result->ConstructL( aSettings );
 	return result;
 	}
 
@@ -188,7 +188,7 @@
 	CBrowserPreferences* result;
 	result = CBrowserPreferences::NewLC( aCommsModel, aApiProvider, aSettings );
 	CleanupStack::Pop();
-	return result;	
+	return result;
 	}
 
 // ----------------------------------------------------------------------------
@@ -196,7 +196,7 @@
 // ----------------------------------------------------------------------------
 //
 CBrowserPreferences::CBrowserPreferences( MCommsModel& aCommsModel,
-                                            MApiProvider& aApiProvider) : 
+                                            MApiProvider& aApiProvider) :
     iApiProvider( aApiProvider ),
     iCommsModel( aCommsModel ),
     iEmbeddedMode( EFalse )
@@ -204,7 +204,7 @@
     LOG_ENTERFN("CBrowserPreferences::CBrowserPreferences");
     iAllPreferences.iCookies = EWmlSettingsCookieAllow;
     iAllPreferences.iHttpSecurityWarnings = ETrue;
-    iAllPreferences.iDownloadsOpen = ETrue;    
+    iAllPreferences.iDownloadsOpen = ETrue;
     iAllPreferences.iConnDialogs = ETrue;
     iAllPreferences.iHomePgURL = NULL;
     iAllPreferences.iSearchPgURL = NULL;
@@ -254,40 +254,40 @@
 
     // For short cut functions
     delete iAllPreferences.iShortCutFuncHomePg;
-    iAllPreferences.iShortCutFuncHomePg = NULL; 
+    iAllPreferences.iShortCutFuncHomePg = NULL;
 
     delete iAllPreferences.iShortCutFuncBkMark;
-    iAllPreferences.iShortCutFuncBkMark = NULL; 
+    iAllPreferences.iShortCutFuncBkMark = NULL;
 
     delete iAllPreferences.iShortCutFuncFindKeyWord;
-    iAllPreferences.iShortCutFuncFindKeyWord = NULL; 
+    iAllPreferences.iShortCutFuncFindKeyWord = NULL;
 
     delete iAllPreferences.iShortCutFuncPrePage;
-    iAllPreferences.iShortCutFuncPrePage = NULL; 
+    iAllPreferences.iShortCutFuncPrePage = NULL;
 
     delete iAllPreferences.iShortCutFuncSwitchWin;
-    iAllPreferences.iShortCutFuncSwitchWin = NULL; 
+    iAllPreferences.iShortCutFuncSwitchWin = NULL;
 
     delete iAllPreferences.iShortCutFuncMiniImage;
-    iAllPreferences.iShortCutFuncMiniImage = NULL; 
+    iAllPreferences.iShortCutFuncMiniImage = NULL;
 
     delete iAllPreferences.iShortCutFuncFullScreen;
-    iAllPreferences.iShortCutFuncFullScreen = NULL; 
+    iAllPreferences.iShortCutFuncFullScreen = NULL;
 
     delete iAllPreferences.iShortCutFuncGoAddr;
-    iAllPreferences.iShortCutFuncGoAddr = NULL; 
+    iAllPreferences.iShortCutFuncGoAddr = NULL;
 
     delete iAllPreferences.iShortCutFuncZoomIn;
-    iAllPreferences.iShortCutFuncZoomIn = NULL; 
+    iAllPreferences.iShortCutFuncZoomIn = NULL;
 
     delete iAllPreferences.iShortCutFuncZoomOut;
-    iAllPreferences.iShortCutFuncZoomOut = NULL; 
+    iAllPreferences.iShortCutFuncZoomOut = NULL;
 
     delete iAllPreferences.iShortCutFuncZoomMode;
-    iAllPreferences.iShortCutFuncZoomMode = NULL; 
+    iAllPreferences.iShortCutFuncZoomMode = NULL;
 
-    delete iAllPreferences.iUrlSuffixList;  
-    iAllPreferences.iUrlSuffixList = NULL;  
+    delete iAllPreferences.iUrlSuffixList;
+    iAllPreferences.iUrlSuffixList = NULL;
     }
 
 // ----------------------------------------------------------------------------
@@ -314,7 +314,7 @@
         if ( iObservers->At( i ) == anObserver )
             {
             iObservers->Delete( i );
-            break; 
+            break;
             }
         }
     }
@@ -329,12 +329,12 @@
     LOG_ENTERFN("CBrowserPreferences::NotifyObserversL");
     TInt i;
     TInt count = iObservers->Count();
-    
+
     // Passed struct of all preferences to observers
     for ( i = 0; i < count; i++ )
         {
-        iObservers->At( i )->HandlePreferencesChangeL( 
-                                                    aEvent, 
+        iObservers->At( i )->HandlePreferencesChangeL(
+                                                    aEvent,
                                                     iAllPreferences,
                                                     aSettingType );
         }
@@ -350,23 +350,23 @@
 //
 //  READ USER VARIATED SETTINGS
 //
-    
+
 	//Read auto load content setting
     iAllPreferences.iAutoLoadContent = GetIntValue( KBrowserNGImagesEnabled );
-    
+
     //Read font size
     iAllPreferences.iFontSize = GetIntValue( KBrowserNGFontSize );
 
 	// Read Allow Cookies setting
     if ( GetIntValue( KBrowserNGCookiesEnabled ) )
-        {    
+        {
         iAllPreferences.iCookies = EWmlSettingsCookieAllow;
         }
     else
         {
         iAllPreferences.iCookies = EWmlSettingsCookieReject;
         }
-        
+
     // Read ECMA Setting
     if ( GetIntValue( KBrowserNGECMAScriptSupport ) )
         {
@@ -389,11 +389,11 @@
             iAllPreferences.iIMEINotification = EWmlSettingsIMEIDisable;
             }
         }
-    
+
     TInt encoding;
 	iRepository->Get( KBrowserNGEncoding, encoding );
     iAllPreferences.iEncoding = ( TUint32 ) encoding;
-    
+
     iAllPreferences.iScriptLog = GetIntValue( KBrowserNGScriptLog ) ;
 
     //Read Fullscreen setting
@@ -407,13 +407,13 @@
             iAllPreferences.iFullScreen = EWmlSettingsFullScreenFullScreen;
             break;
         	}
-  
+
         case KBrowserFullScreenSettingDataSoftkeysOn:
             {
             iAllPreferences.iFullScreen = EWmlSettingsFullScreenSoftkeysOnly;
             break;
             }
- 
+
         default:
             {
             break;
@@ -433,19 +433,19 @@
             {
             case (KBrowserAdaptiveBookmarksSettingDataOn):
                 {
-                iAllPreferences.iAdaptiveBookmarks = 
+                iAllPreferences.iAdaptiveBookmarks =
                                             EWmlSettingsAdaptiveBookmarksOn;
                 break;
                 }
             case (KBrowserAdaptiveBookmarksSettingDataHideFolder):
                 {
-                iAllPreferences.iAdaptiveBookmarks = 
+                iAllPreferences.iAdaptiveBookmarks =
                                     EWmlSettingsAdaptiveBookmarksHideFolder;
                 break;
                 }
             case (KBrowserAdaptiveBookmarksSettingDataOff):
                 {
-                iAllPreferences.iAdaptiveBookmarks = 
+                iAllPreferences.iAdaptiveBookmarks =
                                     EWmlSettingsAdaptiveBookmarksOff;
                 break;
                 }
@@ -453,22 +453,22 @@
                 {
                 break;
                 }
-            }        
+            }
         }
 
-//  
+//
 //  READ OPERATOR VARIATED SETTINGS
 //
 
-	iAllPreferences.iHomePgType = 
+	iAllPreferences.iHomePgType =
                 ( TWmlSettingsHomePage ) GetIntValue( KBrowserNGHomepageType );
-    iAllPreferences.iPageOverview = GetIntValue ( 
+    iAllPreferences.iPageOverview = GetIntValue (
 		                                    KBrowserNGPageOverview );
-	iAllPreferences.iBackList = GetIntValue ( 
+	iAllPreferences.iBackList = GetIntValue (
 		                                    KBrowserNGBackList );
-	iAllPreferences.iAutoRefresh = GetIntValue ( 
-		                                    KBrowserNGAutoRefresh );	
-    
+	iAllPreferences.iAutoRefresh = GetIntValue (
+		                                    KBrowserNGAutoRefresh );
+
     if(PROGRESSIVE_DOWNLOAD)
 	    {
     	iAllPreferences.iDownloadsOpen = GetIntValue ( KBrowserNGOpenDownloads );
@@ -477,28 +477,28 @@
     	{
     	iAllPreferences.iDownloadsOpen = EFalse;
     	}
-		                                    
+
     //Read suppress security UI setting
     iAllPreferences.iHTTPSecuritySupressed = GetIntValue ( KBrowserSecurityUI );
 
     //Read show connection queries setting
     iAllPreferences.iConnDialogs = GetIntValue( KBrowserConnectionDialogs );
-    
+
     if( !iAllPreferences.iHTTPSecuritySupressed )
         {
         // Read HTTP security warnings setting
-	    iAllPreferences.iHttpSecurityWarnings = GetIntValue ( 
+	    iAllPreferences.iHttpSecurityWarnings = GetIntValue (
 		                            KBrowserNGShowSecurityWarnings );
         }
-    else 
+    else
         {
         //we don't want to see sec warning because they're supressed
         iAllPreferences.iHttpSecurityWarnings = EFalse;
-        }    
-    
+        }
+
     // Media Volume uses different SD ini. Revert to Browser SD ini after use
     iAllPreferences.iMediaVolume = GetIntValue( KBrowserMediaVolumeControl );
-    
+
     // Pop up Blocking
     iAllPreferences.iPopupBlocking = GetIntValue( KBrowserNGPopupBlocking );
 
@@ -507,7 +507,7 @@
 
     // Access Keys
     iAllPreferences.iAccessKeys = (TBool) GetIntValue( KBrowserNGAccessKeys );
-    
+
     // The leaving functions come at the end
 
     // Search Page
@@ -516,12 +516,12 @@
         delete iAllPreferences.iSearchPgURL;
         iAllPreferences.iSearchPgURL = NULL;
         }
-        
+
     // Web reed feeds settings - begin
     iAllPreferences.iAutomaticUpdatingAP = GetIntValue( KBrowserNGAutomaticUpdatingAccessPoint );
-    
+
     iAllPreferences.iAutomaticUpdatingWhileRoaming = GetIntValue( KBrowserNGAutomaticUpdatingWhileRoaming );
-    
+
     // Web reed feeds settings - end
     if (CBrowserAppUi::Static()->OrientationCanBeChanged() )
         {
@@ -547,41 +547,41 @@
     const TInt selectionMode = GetIntValue( KBrowserAccessPointSelectionMode );
     switch ( selectionMode )
         {
-        case EBrowserCenRepApSelModeUserDefined: 
+        case EBrowserCenRepApSelModeUserDefined:
              {
-             iAllPreferences.iAccessPointSelectionMode = EConnectionMethod; 
-             break; 
+             iAllPreferences.iAccessPointSelectionMode = EConnectionMethod;
+             break;
              }
-        case EBrowserCenRepApSelModeAlwaysAsk: 
+        case EBrowserCenRepApSelModeAlwaysAsk:
              {
-             iAllPreferences.iAccessPointSelectionMode = EAlwaysAsk; 
-             break; 
+             iAllPreferences.iAccessPointSelectionMode = EAlwaysAsk;
+             break;
              }
         case EBrowserCenRepApSelModeDestination:
              {
-             iAllPreferences.iAccessPointSelectionMode = EDestination; 
-             break; 
+             iAllPreferences.iAccessPointSelectionMode = EDestination;
+             break;
              }
         default: // Default to Always ask.
              {
-             iAllPreferences.iAccessPointSelectionMode = EAlwaysAsk; 
-             break; 
+             iAllPreferences.iAccessPointSelectionMode = EAlwaysAsk;
+             break;
              }
         }
- 
-    //we differentiate by connecting with a Snap or an access point                         
+
+    //we differentiate by connecting with a Snap or an access point
    if (iAllPreferences.iAccessPointSelectionMode == EConnectionMethod)
-   	    {   		
+   	    {
         //Read default AP setting
         ap = GetIntValue( KBrowserDefaultAccessPoint );
 
-        SetDefaultAccessPointL( ap );   
+        SetDefaultAccessPointL( ap );
 		}
     else if (iAllPreferences.iAccessPointSelectionMode == EDestination)
 		{
    		iAllPreferences.iDefaultSnapId = GetIntValue( KBrowserNGDefaultSnapId );
 		}
-	
+
     // For Short Cut keys
     if ( iAllPreferences.iShortCutFuncHomePg )
         {
@@ -686,7 +686,7 @@
 
     // For Configuring Toolbar Buttons
     iAllPreferences.iToolbarOnOff       = GetIntValue( KToolbarOnOff );
-    
+
     iAllPreferences.iToolbarButton1Cmd  = GetIntValue( KToolbarButton1Cmd );
     iAllPreferences.iToolbarButton2Cmd  = GetIntValue( KToolbarButton2Cmd );
     iAllPreferences.iToolbarButton3Cmd  = GetIntValue( KToolbarButton3Cmd );
@@ -694,10 +694,10 @@
     iAllPreferences.iToolbarButton5Cmd  = GetIntValue( KToolbarButton5Cmd );
     iAllPreferences.iToolbarButton6Cmd  = GetIntValue( KToolbarButton6Cmd );
     iAllPreferences.iToolbarButton7Cmd  = GetIntValue( KToolbarButton7Cmd );
-    
-    // For configuring Shortcut Keys 
+
+    // For configuring Shortcut Keys
     iAllPreferences.iShortcutKeysForQwerty  = GetIntValue( KShortcutKeysForQwerty );
-	
+
     iAllPreferences.iShortcutKey1Cmd  = GetIntValue( KShortcutKey1Cmd );
     iAllPreferences.iShortcutKey2Cmd  = GetIntValue( KShortcutKey2Cmd );
     iAllPreferences.iShortcutKey3Cmd  = GetIntValue( KShortcutKey3Cmd );
@@ -715,12 +715,13 @@
     iAllPreferences.iZoomLevelMin = GetIntValue( KBrowserNGZoomMin );
     iAllPreferences.iZoomLevelMax = GetIntValue( KBrowserNGZoomMax );
     iAllPreferences.iZoomLevelDefault = GetIntValue( KBrowserNGZoomDefault );
-            
+
     iAllPreferences.iMaxRecentUrlsToShow = GetIntValue( KBrowserNGMaxRecentUrls );
 
     iAllPreferences.iSearch = GetIntValue( KBrowserSearch );
     iAllPreferences.iService = GetIntValue( KBrowserServices );
-    }
+    iAllPreferences.iCursorShowMode = (TBrCtlDefs::TCursorSettings)GetIntValue( KBrowserCursorShowMode );
+	}
 
 
 // ----------------------------------------------------------------------------
@@ -739,13 +740,13 @@
 TBool CBrowserPreferences::VpnDataL( TUint aDefaultAccessPoint, CVpnApItem& aVpnItem )
     {
     TBool ret( EFalse );
-    
+
     if( iVpnEngine->IsVpnApL( aDefaultAccessPoint ) )
         {
         iVpnEngine->VpnDataL( aDefaultAccessPoint, aVpnItem );
         ret = ETrue;
         }
-    
+
     return ret;
     }
 
@@ -771,13 +772,13 @@
             // if it doesn't, reset access point to always ask and homepage to blank access point home page.
             TUint snapId = iAllPreferences.iDefaultSnapId;
             if (snapId != KWmlNoDefaultSnapId)
-                {            
+                {
     			TRAPD(err, RCmDestination dest = cmManager.DestinationL( snapId ));
     			if (err != KErrNone)
     			    {
     			    aDefaultAccessPoint = KWmlNoDefaultAccessPoint;
         	    	aAssocVpn = KWmlNoDefaultAccessPoint;
-        	    	
+
         			SetAccessPointSelectionModeL(EAlwaysAsk );
         			if (iAllPreferences.iHomePgType == EWmlSettingsHomePageAccessPoint)
         				{
@@ -794,7 +795,7 @@
 
 			break;
         	}
-        	
+
         //if connecting with Iap Id
         case EConnectionMethod:
             {
@@ -803,15 +804,15 @@
   	        CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( aDefaultAccessPoint );
 	        if (apItem == NULL)
                 {
-                TBool isVpn = EFalse; 
-                TRAPD(leaveCode, isVpn = iVpnEngine->IsVpnApL( aDefaultAccessPoint )) 
+                TBool isVpn = EFalse;
+                TRAPD(leaveCode, isVpn = iVpnEngine->IsVpnApL( aDefaultAccessPoint ))
                 if ( leaveCode == KErrNone )
                 {
-                    if ( isVpn ) 
+                    if ( isVpn )
                         {
                         BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) );
-                        break;               
-                        }    	    	
+                        break;
+                        }
                 }
     	    	aDefaultAccessPoint = KWmlNoDefaultAccessPoint;
     	    	aAssocVpn = KWmlNoDefaultAccessPoint;
@@ -828,17 +829,17 @@
         			CleanupStack::PopAndDestroy( buf );
     				}
 		    	}
-            
-		    break;	
+
+		    break;
         	}
 
         default:
         	{
-        	break;	
+        	break;
         	}
         }
-    
-    	
+
+
 	// check web feeds for deleted access point
 	CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( iAllPreferences.iAutomaticUpdatingAP );
 	if (apItem == NULL)
@@ -858,23 +859,23 @@
 
         TUint32 ass( aDefaultAccessPoint );
         iVpnItem->ReadUint( EApVpnWapAccessPointID, ass );
-        aAssocVpn = ass;            
+        aAssocVpn = ass;
 
         // get real WAP id
         TUint32 ap( aDefaultAccessPoint );
         iVpnItem->ReadUint( EApVpnRealWapID, ap );
         aDefaultAccessPoint = ap;
-        }    
+        }
     BROWSER_LOG( ( _L( "VPN OK" ) ) );
 	iAllPreferences.iDefaultAccessPoint = aDefaultAccessPoint;
 	iAllPreferences.iAssocVpn = aAssocVpn;
-	
-	CApAccessPointItem* api = CApAccessPointItem::NewLC();//maybe we can optimise this too	    
+
+	CApAccessPointItem* api = CApAccessPointItem::NewLC();//maybe we can optimise this too
 	BROWSER_LOG( ( _L( "CApAccessPointItem OK" ) ) );
     TInt err;
     if  ( iOverridenSettings )
         {
-        iCustomAp = iOverridenSettings->GetBrowserSetting( 
+        iCustomAp = iOverridenSettings->GetBrowserSetting(
                                                 EBrowserOverSettingsCustomAp );
         }
     if ( ( iOverridenSettings ) &&  iCustomAp  )
@@ -888,23 +889,23 @@
         }
     else
         {
-	    TRAP( err, iApDH->AccessPointDataL( 
-	                            iAllPreferences.iDefaultAccessPoint, *api ) );	        
+	    TRAP( err, iApDH->AccessPointDataL(
+	                            iAllPreferences.iDefaultAccessPoint, *api ) );
         }
     BROWSER_LOG( ( _L( " AccessPointDataL: %d" ), err ) );
 	//Reset default AP pointer and delete the data
 	delete iAllPreferences.iDefaultAPDetails;
 	iAllPreferences.iDefaultAPDetails = NULL;
-	if  ( err != KErrNone )//Let's select the first 
+	if  ( err != KErrNone )//Let's select the first
 		{
-#ifndef __WINSCW__ //we will not select on Wins (defaultap will be assigned a uid indicating that there is 
+#ifndef __WINSCW__ //we will not select on Wins (defaultap will be assigned a uid indicating that there is
 					//no default ap) but rather let ConnMan show the Conn Dlg
 		// The first valid access point has to be selected if exists
 		LOG_WRITE("WE SHOULD NOT BE HERE!!!");
 		CApSelect* apSelect = CApSelect::NewLC
 			(
 			iCommsModel.CommsDb(),
-			KEApIspTypeAll, //KEApIspTypeWAPMandatory, 
+			KEApIspTypeAll, //KEApIspTypeWAPMandatory,
 			EApBearerTypeAll,
 			KEApSortNameAscending,
 			EIPv4 | EIPv6
@@ -926,13 +927,13 @@
 #else
 		iAllPreferences.iDefaultAccessPoint = KWmlNoDefaultAccessPoint;
 		iAllPreferences.iDefaultAPDetails = NULL;
-		CleanupStack::PopAndDestroy( api );		
-#endif//WINSCW	
+		CleanupStack::PopAndDestroy( api );
+#endif//WINSCW
 		}
 	else
 		{
 		iAllPreferences.iDefaultAPDetails = api;//store new default accesspoint details
-		CleanupStack::Pop( ); // api			
+		CleanupStack::Pop( ); // api
 		}
 	/*
 	* If VPN set VPN AP ID to default access point!
@@ -943,29 +944,29 @@
 	    }
     if( !iEmbeddedMode )
         {
-	    //Store ini value / gateway 
-        SetIntValueL ( KBrowserDefaultAccessPoint, 
+	    //Store ini value / gateway
+        SetIntValueL ( KBrowserDefaultAccessPoint,
                                         iAllPreferences.iDefaultAccessPoint );
         }
     NotifyObserversL( EPreferencesItemChange );
-	    
+
 	//  LOG_LEAVEFN("CBrowserPreferences::SetDefaultAccessPointL");
 	}
-	
-	
+
+
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::SetDefaultSnapId: DestNetChange
 // ----------------------------------------------------------------------------
 //
  void CBrowserPreferences::SetDefaultSnapId (TUint aSnapId)
 		{
-	
+
 		//storing the value of the default snap ID
 		iAllPreferences.iDefaultSnapId = aSnapId;
-		                                        
-        SetIntValueL ( KBrowserNGDefaultSnapId, 
+
+        SetIntValueL ( KBrowserNGDefaultSnapId,
                                         iAllPreferences.iDefaultSnapId );
-	
+
 		}
 
 
@@ -983,10 +984,10 @@
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            SetIntValueL( KBrowserNGImagesEnabled, 
+            SetIntValueL( KBrowserNGImagesEnabled,
                                     iAllPreferences.iAutoLoadContent );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                         TBrCtlDefs::ESettingsAutoLoadImages );
         }
     }
@@ -1005,14 +1006,14 @@
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            SetIntValueL( KBrowserNGPageOverview, 
+            SetIntValueL( KBrowserNGPageOverview,
                                         iAllPreferences.iPageOverview );
             }
         NotifyObserversL( EPreferencesItemChange,
                             TBrCtlDefs::ESettingsPageOverview);
         }
     }
-    
+
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::SetBackListL
 // ----------------------------------------------------------------------------
@@ -1027,14 +1028,14 @@
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            SetIntValueL( KBrowserNGBackList, 
+            SetIntValueL( KBrowserNGBackList,
                                         iAllPreferences.iBackList );
             }
         NotifyObserversL( EPreferencesItemChange,
                             TBrCtlDefs::ESettingsBackList);
         }
     }
-    
+
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::SetAutoRefreshL
 // ----------------------------------------------------------------------------
@@ -1049,13 +1050,13 @@
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            SetIntValueL( KBrowserNGAutoRefresh, 
+            SetIntValueL( KBrowserNGAutoRefresh,
                                         iAllPreferences.iAutoRefresh );
             }
         NotifyObserversL( EPreferencesItemChange,
                             TBrCtlDefs::ESettingsAutoRefresh);
         }
-    }    
+    }
 
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::SetTextWrapL
@@ -1072,8 +1073,8 @@
         if ( !iEmbeddedMode )
             {
             SetIntValueL( KBrowserTextWrapEnabled, iAllPreferences.iTextWrap );
-            }            
-        NotifyObserversL( EPreferencesItemChange, 
+            }
+        NotifyObserversL( EPreferencesItemChange,
                                         TBrCtlDefs::ESettingsTextWrapEnabled );
         }
     }
@@ -1094,7 +1095,7 @@
             {
             SetIntValueL( KBrowserNGFontSize, iAllPreferences.iFontSize );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                             TBrCtlDefs::ESettingsFontSize );
         }
     }
@@ -1109,14 +1110,14 @@
     if ( aEncoding != iAllPreferences.iEncoding )
         {
         iAllPreferences.iEncoding = aEncoding;
-    
+
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            SetIntValueL ( KBrowserNGEncoding, 
+            SetIntValueL ( KBrowserNGEncoding,
                             ( TInt ) iAllPreferences.iEncoding );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                         TBrCtlDefs::ESettingsCharacterset );
         }
     }
@@ -1131,14 +1132,14 @@
     if ( aScriptLog != iAllPreferences.iScriptLog )
         {
         iAllPreferences.iScriptLog = aScriptLog;
-    
+
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            TBool ret = SetIntValueL ( KBrowserNGScriptLog, 
+            TBool ret = SetIntValueL ( KBrowserNGScriptLog,
                             ( TInt ) iAllPreferences.iScriptLog );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                         TBrCtlDefs::ESettingsScriptLog );
         }
     }
@@ -1147,17 +1148,17 @@
 // CBrowserPreferences::SetAdaptiveBookmarksL
 // ----------------------------------------------------------------------------
 //
-void CBrowserPreferences::SetAdaptiveBookmarksL( 
+void CBrowserPreferences::SetAdaptiveBookmarksL(
                             TWmlSettingsAdaptiveBookmarks aAdaptiveBookmarks )
     {
     LOG_ENTERFN( "CBrowserPreferences::SetAdaptiveBookmarksL" );
-    
+
     if ( ADAPTIVEBOOKMARKS )
         {
         if ( aAdaptiveBookmarks != iAllPreferences.iAdaptiveBookmarks )
             {
             iAllPreferences.iAdaptiveBookmarks = aAdaptiveBookmarks;
-            
+
             if( !iEmbeddedMode )
                 {
 
@@ -1165,20 +1166,20 @@
                 {
 				case (EWmlSettingsAdaptiveBookmarksOn):
                     {
-             
-       				SetIntValueL ( KBrowserNGAdaptiveBookmarks, 
-       					KBrowserAdaptiveBookmarksSettingDataOn );                   
+
+       				SetIntValueL ( KBrowserNGAdaptiveBookmarks,
+       					KBrowserAdaptiveBookmarksSettingDataOn );
                     break;
                     }
                 case (EWmlSettingsAdaptiveBookmarksHideFolder):
                     {
-                    SetIntValueL ( KBrowserNGAdaptiveBookmarks, 
+                    SetIntValueL ( KBrowserNGAdaptiveBookmarks,
                     	KBrowserAdaptiveBookmarksSettingDataHideFolder );
                     break;
                     }
                 case (EWmlSettingsAdaptiveBookmarksOff):
                     {
-                    SetIntValueL ( KBrowserNGAdaptiveBookmarks, 
+                    SetIntValueL ( KBrowserNGAdaptiveBookmarks,
                     	KBrowserAdaptiveBookmarksSettingDataOff );
                     break;
                     }
@@ -1200,7 +1201,7 @@
 void CBrowserPreferences::SetFullScreenL( TWmlSettingsFullScreen aFullScreen )
     {
     LOG_ENTERFN("CBrowserPreferences::SetFullScreenL");
-  
+
     if ( aFullScreen != iAllPreferences.iFullScreen )
         {
         iAllPreferences.iFullScreen = aFullScreen;
@@ -1210,20 +1211,20 @@
                 {
 				case EWmlSettingsFullScreenSoftkeysOnly:
                     {
-                    SetIntValueL ( KBrowserNGFullScreen, 
+                    SetIntValueL ( KBrowserNGFullScreen,
                     	KBrowserFullScreenSettingDataSoftkeysOn );
                     break;
                     }
                 case EWmlSettingsFullScreenFullScreen:
                     {
-                    SetIntValueL ( KBrowserNGFullScreen, 
+                    SetIntValueL ( KBrowserNGFullScreen,
                     	KBrowserFullScreenSettingDataSoftkeysOff );
                     break;
                     }
                 default:
                     {
                     break;
-                    }    
+                    }
                 }
             }
         NotifyObserversL( EPreferencesItemChange ); // ContentView is interested
@@ -1244,10 +1245,10 @@
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-            SetIntValueL( KBrowserNGCookiesEnabled, 
+            SetIntValueL( KBrowserNGCookiesEnabled,
                                             iAllPreferences.iCookies );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                         TBrCtlDefs::ESettingsCookiesEnabled );
         }
     }
@@ -1266,10 +1267,10 @@
         // Store value in Shared Data and forward new setting to BrCtl
         if( !iEmbeddedMode )
             {
-			SetIntValueL( KBrowserNGECMAScriptSupport, 
+			SetIntValueL( KBrowserNGECMAScriptSupport,
 			                                    iAllPreferences.iEcma );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                     TBrCtlDefs::ESettingsECMAScriptEnabled );
         }
     }
@@ -1286,10 +1287,10 @@
         iAllPreferences.iDownloadsOpen = aOpen;
         if( !iEmbeddedMode )
             {
-			SetIntValueL ( KBrowserNGOpenDownloads, 
+			SetIntValueL ( KBrowserNGOpenDownloads,
 				        (TInt) iAllPreferences.iDownloadsOpen );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                     TBrCtlDefs::ESettingsAutoOpenDownloads );
         }
     }
@@ -1307,10 +1308,10 @@
         iAllPreferences.iHttpSecurityWarnings = aWarningsOn;
         if( !iEmbeddedMode )
             {
-			SetIntValueL ( KBrowserNGShowSecurityWarnings, 
+			SetIntValueL ( KBrowserNGShowSecurityWarnings,
 				        (TInt) iAllPreferences.iHttpSecurityWarnings );
             }
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                     TBrCtlDefs::ESettingsSecurityWarnings );
         }
     }
@@ -1319,7 +1320,7 @@
 // CBrowserPreferences::SetIMEINotification
 // ----------------------------------------------------------------------------
 //
-void CBrowserPreferences::SetIMEINotificationL( 
+void CBrowserPreferences::SetIMEINotificationL(
                                         TWmlSettingsIMEI aIMEINotification )
     {
     LOG_ENTERFN("CBrowserPreferences::SetIMEINotificationL");
@@ -1328,14 +1329,14 @@
         if ( aIMEINotification != iAllPreferences.iIMEINotification )
             {
             iAllPreferences.iIMEINotification = aIMEINotification;
-            
+
             // Store value in Shared Data and forward new setting to BrCtl
             if( !iEmbeddedMode )
                 {
-                SetIntValueL( KBrowserIMEINotification, 
+                SetIntValueL( KBrowserIMEINotification,
                                         iAllPreferences.iIMEINotification );
                 }
-            NotifyObserversL( EPreferencesItemChange, 
+            NotifyObserversL( EPreferencesItemChange,
                                     TBrCtlDefs::ESettingsIMEINotifyEnabled );
             }
         }
@@ -1351,7 +1352,7 @@
     if ( anEvent == EDbChanged )//maybe somebody has modified the AP (not very likely though)
         {
         SetDefaultAccessPointL( iAllPreferences.iDefaultAccessPoint );
-        }    
+        }
     }
 
 // ----------------------------------------------------------------------------
@@ -1376,13 +1377,13 @@
 		    // the value of the home page from the shared data
 			homePgFound = GetStringValueL( KBrowserNGHomepageURL, KMaxHomePgUrlLength, aUrl );
 			}
-		else if ((iAllPreferences.iAccessPointSelectionMode == EConnectionMethod) && 
+		else if ((iAllPreferences.iAccessPointSelectionMode == EConnectionMethod) &&
 				 (pgtype == EWmlSettingsHomePageAccessPoint))
         {
 			// The user has a defined access point, and wants to use the access point's
     		// home page
 BROWSER_LOG( ( _L( "HomePageUrl, Access Point" ) ) );
-        
+
         TUint defaultAp = DefaultAccessPoint();
         if ( defaultAp != KWmlNoDefaultAccessPoint ) // There is an access point defined
             {
@@ -1441,7 +1442,7 @@
 //
 TPtrC CBrowserPreferences::SearchPageUrlL()
     {
-LOG_ENTERFN("CBrowserPreferences::SearchPageUrlL");    
+LOG_ENTERFN("CBrowserPreferences::SearchPageUrlL");
     TBool urlTooBig = EFalse;
     TInt error = KErrTooBig;
     TInt length = 512;
@@ -1482,7 +1483,7 @@
         }
 
     NotifyObserversL( EPreferencesItemChange );
-    
+
 #ifdef _DEBUG
     TPtrC logString = *iAllPreferences.iSearchPgURL;
     BROWSER_LOG( ( _L( "CBrowserPreferences::SearchPageUrlL returns %S" ), &logString ) );
@@ -1517,12 +1518,12 @@
 
 
         // TO DO: Add to cenrep
-        SetIntValueL( KBrowserFormDataSaving, 
+        SetIntValueL( KBrowserFormDataSaving,
                         iAllPreferences.iFormDataSaving );
         }
     NotifyObserversL( EPreferencesItemChange,
                             TBrCtlDefs::ESettingsAutoFormFillEnabled );
-    }    
+    }
 
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::GetIntValue
@@ -1531,17 +1532,17 @@
 TInt CBrowserPreferences::GetIntValue( TUint32 aKey) const
     {
 LOG_ENTERFN("CBrowserPreferences::GetIntValue");
-    TInt retVal = 0; 
-      
+    TInt retVal = 0;
+
 	if ( iRepository )
 	   	{
-    	iRepository->Get(aKey, retVal);	
+    	iRepository->Get(aKey, retVal);
     	}
-                
+
 BROWSER_LOG( ( _L( "CBrowserPreferences::GetIntValue returns %d" ), retVal ) );
     return retVal;
     }
-    									   
+
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::SetIntValueL
 // ----------------------------------------------------------------------------
@@ -1550,19 +1551,19 @@
     {
 LOG_ENTERFN("CBrowserPreferences::SetIntValueL");
 BROWSER_LOG( ( _L( "aValue: %d" ), aValue ) );
-    
+
     // Log setting value BEFORE the change
     #ifdef I__BROWSER_LOG_ENABLED
         TInt preValue;
     	iRepository->Get( aKey, preValue );
         BROWSER_LOG( ( _L( "Prechange CenRep setting value: %d" ), preValue ) );
     #endif // I__BROWSER_LOG_ENABLED
-    
+
     TBool retVal=EFalse;
 	if ( iRepository && ( KErrNone == iRepository->Set( aKey, aValue ) ) )
     	{
     	retVal = ETrue;
-    	}	
+    	}
 
     // Log setting value AFTER the change
     #ifdef I__BROWSER_LOG_ENABLED
@@ -1573,7 +1574,7 @@
 
     BROWSER_LOG( ( _L( "CBrowserPreferences::SetIntValueL returns %d" ), retVal ) );
     return retVal;
-    }	
+    }
 
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::GetStringValueL
@@ -1586,7 +1587,7 @@
     TFileName value;
     TInt err( KErrNotFound );
 
-	
+
 	if( iRepository )
 		{
 		err = iRepository->Get( aKey, value );
@@ -1598,12 +1599,12 @@
        	TPtr ptr = retVal->Des();
        	ptr.Copy ( value );
        	}
-        
+
     #ifdef _DEBUG
         TPtrC logString = *retVal;
         BROWSER_LOG( ( _L( "CBrowserPreferences::GetStringValueL returns %S" ), &logString ) );
     #endif // _DEBUG
-    
+
     return retVal;
     }
 
@@ -1611,20 +1612,20 @@
 // CBrowserPreferences::GetStringValueL
 // ----------------------------------------------------------------------------
 //
-TInt CBrowserPreferences::GetStringValueL( 
-		TUint32 aKey, TInt aMaxBufSize, 
+TInt CBrowserPreferences::GetStringValueL(
+		TUint32 aKey, TInt aMaxBufSize,
 		TDes& aBuf) const
     {
 LOG_ENTERFN("CBrowserPreferences::GetStringValueL(TUint32,TInt,TDes&)");
     // Not sure this works, but CRepository has no information about the return
-    // values of the methods. 
+    // values of the methods.
     // So dont know if iRepository->Get returns with an errorid on error,therefore
     // error = iRepository->Get( aKey, ptr ) may not work.
     TInt length( 256 );
     HBufC* value = HBufC::NewL( length );
     TPtr ptr = value->Des();
     TInt error;
-    
+
 	error = iRepository->Get( aKey, ptr );
 
     for( length=length*2; (error==KErrTooBig) && (length<aMaxBufSize); length=length*2)
@@ -1632,7 +1633,7 @@
         delete value;
         value = HBufC::NewL( length );
         ptr = value->Des();
-        
+
 		error = iRepository->Get( aKey, ptr );
         }
     if( error == KErrNone )
@@ -1641,7 +1642,7 @@
         aBuf.Append( ptr );
         }
     delete value;
-    
+
     BROWSER_LOG( ( _L( "CBrowserPreferences::GetStringValueL(TUint32,TInt,TDes&) returns %d" ),
         error ) );
     return error;
@@ -1662,27 +1663,27 @@
         BROWSER_LOG( ( _L( "aValue %S" ), &paramVal ) );
         HBufC* doNothing = HBufC::NewL( 512 );
         TPtr preChange = doNothing->Des();
-    	iRepository->Get( aKey, preChange );	
+    	iRepository->Get( aKey, preChange );
         BROWSER_LOG( ( _L( "Prechange CenRep setting value: %S" ), &preChange ) );
         delete doNothing;
     #endif // _DEBUG
 
     TBool retVal=EFalse;
-	
+
 	if ( iRepository && ( KErrNone == iRepository->Set( aKey, aValue ) ) )
     	{
     	retVal = ETrue;
-    	}	
+    	}
     // Log setting value AFTER the change
     #ifdef _DEBUG
         HBufC* doNothing2 = HBufC::NewL( 512 );
         TPtr postChange = doNothing2->Des();
-   		iRepository->Get( aKey, postChange );	
-        
+   		iRepository->Get( aKey, postChange );
+
         BROWSER_LOG( ( _L( "Postchange CenRep setting value: %S" ), &postChange ) );
         delete doNothing2;
     #endif // _DEBUG
-    
+
     BROWSER_LOG( ( _L( "CBrowserPreferences::SetStringValueL returns %d" ), retVal) );
     return retVal;
     }
@@ -1700,7 +1701,7 @@
         TUint tempValue;
         iOverriden = ETrue;
         iOverridenSettings = aSettings;
-        
+
         // Check overridden settings by looking at their default values
         // (see how Launcher2 sets them in the OverriddenSettings constructor)
         tempValue = iOverridenSettings->GetBrowserSetting( EBrowserOverSettingsCustomAp );
@@ -1712,7 +1713,7 @@
             }
         tempValue = iOverridenSettings->GetBrowserSetting( EBrowserOverSettingsAutoLoadImages );
         if( tempValue != KMaxTUint )
-            {           
+            {
             iAllPreferences.iAutoLoadContent = tempValue;
             }
 
@@ -1751,7 +1752,7 @@
     iEmbeddedMode = aEmbeddedMode;
     if( iEmbeddedMode /* && ApiProvider().StartedUp()*/ )
         {
-        NotifyObserversL( EPreferencesItemChange, 
+        NotifyObserversL( EPreferencesItemChange,
                                             TBrCtlDefs::ESettingsEmbedded );
         }
     return;
@@ -1792,10 +1793,10 @@
     if( aHomePageURL.Length() )
         {
         // Save the homepage with a scheme (default is http if not specified).
-        HBufC* temp = Util::AllocateUrlWithSchemeL( aHomePageURL ); 
+        HBufC* temp = Util::AllocateUrlWithSchemeL( aHomePageURL );
         delete iAllPreferences.iHomePgURL;
         iAllPreferences.iHomePgURL = temp;
-        SetStringValueL( KBrowserNGHomepageURL, 
+        SetStringValueL( KBrowserNGHomepageURL,
                                         iAllPreferences.iHomePgURL->Des() );
         }
     }
@@ -1809,10 +1810,10 @@
     LOG_ENTERFN("CBrowserPreferences::SetSearchPageUrlL");
 
     // Save the searchpage with a scheme (default is http if not specified).
-    HBufC* temp = Util::AllocateUrlWithSchemeL( aSearchPageURL ); 
+    HBufC* temp = Util::AllocateUrlWithSchemeL( aSearchPageURL );
     delete iAllPreferences.iSearchPgURL;
     iAllPreferences.iSearchPgURL = temp;
-    SetStringValueL( KBrowserNGSearchPageURL, 
+    SetStringValueL( KBrowserNGSearchPageURL,
 	                            iAllPreferences.iSearchPgURL->Des() );
     }
 
@@ -1889,7 +1890,7 @@
 // CBrowserPreferences::SetAccessPointSelectionModeL
 // ----------------------------------------------------------------------------
 //
-void CBrowserPreferences::SetAccessPointSelectionModeL( 
+void CBrowserPreferences::SetAccessPointSelectionModeL(
                 TCmSettingSelectionMode aAccessPointSelectionMode )
     {
     LOG_ENTERFN("CBrowserPreferences::SetAccessPointSelectionModeL");
@@ -1898,30 +1899,30 @@
 		{
 		iAllPreferences.iAccessPointSelectionMode = aAccessPointSelectionMode;
 
-        switch ( aAccessPointSelectionMode )                              
+        switch ( aAccessPointSelectionMode )
             {
             case EAlwaysAsk:
                 {
-                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeAlwaysAsk ); 
-                break; 
+                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeAlwaysAsk );
+                break;
                 }
             case EDestination:
                 {
-                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeDestination ); 
-                break; 
+                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeDestination );
+                break;
                 }
             case EConnectionMethod:
                 {
-                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeUserDefined ); 
+                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeUserDefined );
                 break;
                 }
             default:
                 {
-                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeAlwaysAsk ); 
-                break; 
+                SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeAlwaysAsk );
+                break;
                 }
-            }          
-		}  
+            }
+		}
     }
 
 // ----------------------------------------------------------------------------
@@ -1943,14 +1944,14 @@
     if ( aAutoUpdateRoaming != iAllPreferences.iAutomaticUpdatingWhileRoaming )
         {
         iAllPreferences.iAutomaticUpdatingWhileRoaming = aAutoUpdateRoaming;
-        SetIntValueL( KBrowserNGAutomaticUpdatingWhileRoaming, 
+        SetIntValueL( KBrowserNGAutomaticUpdatingWhileRoaming,
                                         iAllPreferences.iAutomaticUpdatingWhileRoaming );
     	}
-    	
+
     }
 
 
-   
+
 // ---------------------------------------------------------
 // CBrowserPreferences::SetToolbarOnOffL()
 // ---------------------------------------------------------
@@ -1961,14 +1962,14 @@
         {
         iAllPreferences.iToolbarOnOff = aCommand;
         SetIntValueL( KToolbarOnOff, iAllPreferences.iToolbarOnOff );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarOnOff );
         }
     }
 
-    
-    
+
+
 // ---------------------------------------------------------
 // CBrowserPreferences::SetToolbarButton1CmdL()
 // ---------------------------------------------------------
@@ -1979,8 +1980,8 @@
         {
         iAllPreferences.iToolbarButton1Cmd = aCommand;
         SetIntValueL( KToolbarButton1Cmd, iAllPreferences.iToolbarButton1Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton1Cmd );
         }
     }
@@ -1996,8 +1997,8 @@
         {
         iAllPreferences.iToolbarButton2Cmd = aCommand;
         SetIntValueL( KToolbarButton2Cmd, iAllPreferences.iToolbarButton2Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton2Cmd );
         }
     }
@@ -2012,8 +2013,8 @@
         {
         iAllPreferences.iToolbarButton3Cmd = aCommand;
         SetIntValueL( KToolbarButton3Cmd, iAllPreferences.iToolbarButton3Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton3Cmd );
         }
     }
@@ -2028,8 +2029,8 @@
         {
         iAllPreferences.iToolbarButton4Cmd = aCommand;
         SetIntValueL( KToolbarButton4Cmd, iAllPreferences.iToolbarButton4Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton4Cmd );
         }
     }
@@ -2044,8 +2045,8 @@
         {
         iAllPreferences.iToolbarButton5Cmd = aCommand;
         SetIntValueL( KToolbarButton5Cmd, iAllPreferences.iToolbarButton5Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton5Cmd );
         }
     }
@@ -2060,8 +2061,8 @@
         {
         iAllPreferences.iToolbarButton6Cmd = aCommand;
         SetIntValueL( KToolbarButton6Cmd, iAllPreferences.iToolbarButton6Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton6Cmd );
         }
     }
@@ -2076,8 +2077,8 @@
         {
         iAllPreferences.iToolbarButton7Cmd = aCommand;
         SetIntValueL( KToolbarButton7Cmd, iAllPreferences.iToolbarButton7Cmd );
-        
-        NotifyObserversL( EPreferencesItemChange, 
+
+        NotifyObserversL( EPreferencesItemChange,
                           TBrCtlDefs::ESettingsToolbarButton7Cmd );
         }
     }
@@ -2107,7 +2108,7 @@
         SetIntValueL( KShortcutKey2Cmd, iAllPreferences.iShortcutKey2Cmd );
         }
     }
-    
+
 // ---------------------------------------------------------
 // CBrowserPreferences::SetShortcutKey3CmdL()
 // ---------------------------------------------------------
@@ -2238,7 +2239,7 @@
         }
     }
 
-    
+
 // ----------------------------------------------------------------------------
 // CBrowserPreferences::SetURLSuffixList
 // ----------------------------------------------------------------------------
@@ -2246,8 +2247,8 @@
 void CBrowserPreferences::SetURLSuffixList( HBufC* aSetting )
     {
     LOG_ENTERFN("CBrowserPreferences::SetUpdateHoursDefined");
-        
-    SetStringValueL ( KBrowserUrlSuffix, aSetting->Des() );    
+
+    SetStringValueL ( KBrowserUrlSuffix, aSetting->Des() );
 
     TPtr ptr = iAllPreferences.iUrlSuffixList->Des();
     ptr.Copy( aSetting->Des() );
--- a/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -583,7 +583,7 @@
                         }
     				result = ETrue;
        				}
-       			CleanupStack::PopAndDestroy(); //rfile
+       			
        			
                 // delete the downloaded file if it is not handled
                 if(deleteOpml && (dataTypeDes.Compare(KOPMLMimeType) == 0 ))
@@ -591,16 +591,40 @@
                     rfs.Delete(fileName);
                     }       			
         		}
-        	CleanupStack::PopAndDestroy(); //rfs        	
-    		}
-    		
-    	// If open file was handled, skip sending to feeds engine
-    	// otherwise, pass it on
-    	if(!result)
-    		{
-    		// Launch the Feeds Engine
-			iContentView->HandleSubscribeToWithUrlL(url);
-			result = ETrue;	
+        	   		
+    	    // If open file was handled, skip sending to feeds engine
+    	    // otherwise, pass it on
+    	    if(!result)
+    		   {
+    		   TInt fileSize;
+    		   // Read the file from the beginning into a buffer
+    		   User::LeaveIfError(rfile.Size(fileSize));
+    		   HBufC8* buffer = HBufC8::NewLC(fileSize);
+    		   TPtr8 bufferPtr(buffer->Des());
+    		   TInt startPos = 0;
+    		   User::LeaveIfError(rfile.Read(startPos, bufferPtr, fileSize));
+    		       		   
+    		   _LIT8( searchTag1, "<feed" ); //Atom 1.0 Feed
+    		   _LIT8( searchTag2, "<rdf" );  //RSS 1.0 Feed
+    		   _LIT8( searchTag3, "<rss" );  //RSS 2.0 Feed
+    		   
+    		   if( ( bufferPtr.FindF( searchTag1 ) != KErrNotFound ) || (bufferPtr.FindF( searchTag2 ) != KErrNotFound ) ||
+    		       (bufferPtr.FindF( searchTag3 ) != KErrNotFound ) )
+    		       {    
+    		        // Launch the Feeds Engine only when xml file contain atleast one of the above mentioned feeds tag 
+			        iContentView->HandleSubscribeToWithUrlL(url);
+			       }
+    		   else
+    		      {
+    		       //Delete the file, if it is not fwd to Feeds Engine, As displaying of xml files is not supported.  
+    		       rfs.Delete(fileName);
+    		      }
+    		   result = ETrue;  
+    		   CleanupStack::PopAndDestroy(); //buffer
+    		   }
+    	    
+    	    CleanupStack::PopAndDestroy(); //rfile
+    	    CleanupStack::PopAndDestroy(); //rfs
     		}
     	}
     
--- a/browserui/browser/BrowserAppSrc/BrowserWindow.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserWindow.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -832,6 +832,13 @@
                                         Preferences().ZoomLevelDefault() );
             break; 
             }
+        case TBrCtlDefs::ESettingsCursorShowMode:
+            {
+            iBrCtlInterface->SetBrowserSettingL(
+                                        TBrCtlDefs::ESettingsCursorShowMode,
+                                        Preferences().CursorShowMode() );
+            break; 
+            }
         // LOCAL SETTINGS should be ignored
         case TBrCtlDefs::ESettingsTextWrapEnabled:
         case TBrCtlDefs::ESettingsFontSize:
@@ -922,6 +929,7 @@
 	UpdateGlobalPreferencesL( TBrCtlDefs::ESettingsZoomLevelMax );
 	UpdateGlobalPreferencesL( TBrCtlDefs::ESettingsZoomLevelDefault );
 
+	UpdateGlobalPreferencesL( TBrCtlDefs::ESettingsCursorShowMode );
     // Font Size - LOCAL Setting
     iBrCtlInterface->SetBrowserSettingL( TBrCtlDefs::ESettingsFontSize,
             iWindowManager->ApiProvider()->Preferences().FontSize() );
--- a/browserui/browser/FavouritesInc/BrowserFavouritesSelectionState.h	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesSelectionState.h	Thu Sep 24 12:40:29 2009 +0300
@@ -166,6 +166,7 @@
         TInt iMarkedItemCount;      ///< Count of marked items.
         TInt iMarkedFolderCount;    ///< Count of marked folders.
         TInt iVisibleItemCount;     ///< Count of visible items (not folders).
+        TInt iVisibleFolderCount;     ///< Count of visible folders (not items).
     };
 
 #include "BrowserFavouritesSelectionState.inl"
--- a/browserui/browser/FavouritesInc/BrowserFavouritesSelectionState.inl	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesSelectionState.inl	Thu Sep 24 12:40:29 2009 +0300
@@ -34,6 +34,7 @@
     iMarkedItemCount = 0;
     iMarkedFolderCount = 0;
     iVisibleItemCount = 0;
+    iVisibleFolderCount = 0;
     }
 
 // ---------------------------------------------------------
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -636,6 +636,7 @@
             else
                 {
                 CBrowserFavouritesView::HandleCommandL( aCommand );
+                UpdateToolbarButtonsState();
                 }
             break;
             }
@@ -1448,7 +1449,12 @@
 
     #ifndef SHOW_MARK_ALL_ALWAYS
             // As for "mark all", consider items only.
-            if ( aState.iVisibleItemCount == aState.iMarkedItemCount )
+            if ( (aState.iVisibleItemCount == aState.iMarkedItemCount) && (aState.iVisibleFolderCount == aState.iMarkedFolderCount) )
+                {
+                //Checking for both items and folders
+                aMenuPane->SetItemDimmed( EWmlCmdMarkAll, ETrue );
+                }
+           else if( (aState.iVisibleItemCount == 0) && (aState.iVisibleFolderCount < 2))//Only one folder is present and no items
                 {
                 aMenuPane->SetItemDimmed( EWmlCmdMarkAll, ETrue );
                 }
@@ -1471,6 +1477,11 @@
             if( iInAdaptiveBookmarksFolder )
                 {
                 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+                // These options are not required when user press MSK
+                aMenuPane->SetItemDimmed( EWmlCmdAddBookmark, ETrue );
+                aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, ETrue );
+                aMenuPane->SetItemDimmed( EWmlCmdSwitchToGotoActive, ETrue );
+                aMenuPane->SetItemDimmed( EWmlCmdNewFolder, ETrue );
                 }
             const CFavouritesItem* item =  TheContainer()->Listbox()->CurrentItem();
             if  ( ( item ) &&
@@ -1481,16 +1492,14 @@
                 // We can't delete adaptive bookmarks folder,
                 //   or seamless folders
                 aMenuPane->SetItemDimmed( EWmlCmdDelete, ETrue );
+                aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
                 }
                 
-            if (!iPenEnabled)  
-                {
-                aMenuPane->SetItemDimmed( EWmlCmdAddBookmark, ETrue );
-                aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, ETrue );
-                aMenuPane->SetItemDimmed( EWmlCmdSwitchToGotoActive, ETrue );
-                aMenuPane->SetItemDimmed( EWmlCmdNewFolder, ETrue );
-                }
-
+            //Enable CopyToBookmarks option if you are in RecentlyVisitedUrl folder
+			if( iInAdaptiveBookmarksFolder )
+				{
+				aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, EFalse );
+				}
             break;
             }
         default:
@@ -1597,6 +1606,7 @@
 	        if ( (*iItemsToMove)[j] == orderArrayUid ) {
 				sortedItemsToMove->AppendL( (*iItemsToMove)[j] );
 				orderArray->Delete( i );
+				i--;
 				break;
 	        }
         }
@@ -1841,7 +1851,6 @@
         }
     if ( iSaveBMOrder )
         {
-        iRefresh = EFalse;
         iSaveBMOrder = EFalse;
         Model().Database().SetData( aFolder, *iCurrentOrder );
         }
@@ -2205,6 +2214,7 @@
     iRefresh = EFalse;
     Model().Database().SetData( CurrentFolder() , *iCurrentOrder );
     CleanupStack::PopAndDestroy();  // item
+    Container()->Listbox()->ClearSelection();
     }
 
 
--- a/browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -258,6 +258,10 @@
             {
             state.iVisibleItemCount++;
             }
+        else
+            {
+            state.iVisibleFolderCount++;
+            }
         }
 
     TKeyArrayFix key( 0, ECmpTInt32 );
--- a/browserui/browser/FeedsSrc/FeedsEditFolderDialog.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FeedsSrc/FeedsEditFolderDialog.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -242,7 +242,11 @@
 
             break;
 #endif //__SERIES60_HELP 
-
+        case EWmlCmdAboutProduct:
+        {
+         iAppUi->HandleCommandL( aCommandId );
+         break;
+        }
         default:
             // Standard form commands.
             CAknForm::ProcessCommandL(aCommandId);
--- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -1220,12 +1220,11 @@
         {
         // Clear the move state and update the Cba.
         iMoveActive = EFalse;
+		// Remove the marks.
+        iListBox->View()->ClearSelection();
         UpdateCbaL();
         // Un-Dim Toolbar
         DimToolbar(EFalse);
-        
-        // Remove the marks.
-        iListBox->View()->ClearSelection();
         }
     }
 
@@ -1856,11 +1855,13 @@
 void CFeedsFolderContainer::MoveToFolderMoveL(const CFeedsEntity& aTargetFolder)
     {
     RPointerArray<const CFeedsEntity>  markedItems(10);
+    RPointerArray<const CFeedsEntity>  removedItems(10);
+    const RPointerArray<CFeedsEntity>&  folderItems = aTargetFolder.GetChildren();
     const CArrayFix<TInt>*            markedIndexes = NULL;
     const CFeedsEntity*                folder = NULL;
 
     CleanupClosePushL(markedItems);
-
+    CleanupClosePushL(removedItems);
     // Get the array of marked items.
     markedIndexes = MarkedItems();
     if ((markedIndexes == NULL) || (markedIndexes->Count() == 0))
@@ -1873,13 +1874,43 @@
     for (TInt i = 0; i < markedIndexes->Count(); i++)
         {
         folder = iCurrentFolder->GetChildren()[((*markedIndexes)[i])];
-        User::LeaveIfError(markedItems.Append(folder));
+        // if the target folder already has some feed
+        if(folderItems.Count() > 0)
+            {
+            TPtrC item;
+            TPtrC url;
+            folder->GetStringValue(EFeedAttributeTitle, item);
+            const CFeedsEntity*  otherItem = iApiProvider.FeedsClientUtilities().Search(item, aTargetFolder);
+            if(!(otherItem == CurrentItem())&& otherItem != NULL)
+                {
+                otherItem->GetStringValue(EFeedAttributeLink, url);
+                iApiProvider.FeedsClientUtilities().AddFolderItemL(item,url,EFalse,aTargetFolder,0);
+                User::LeaveIfError(removedItems.Append(folder));
+                }
+            else
+                {
+                // feed not present in target folder
+                User::LeaveIfError(markedItems.Append(folder));
+                }
+            }
+        // if the target folder is empty
+        else
+            {
+            // Move the items.
+            User::LeaveIfError(markedItems.Append(folder));
+            }
         }
-    
-    // Move the items.
-    iApiProvider.FeedsClientUtilities().MoveFolderItemsToL(markedItems, aTargetFolder);
-        
+    if(removedItems.Count())
+        {
+        iApiProvider.FeedsClientUtilities().DeleteFolderItemsL(removedItems);
+        }
+    if(markedItems.Count())
+        {
+        // Move the items.
+        iApiProvider.FeedsClientUtilities().MoveFolderItemsToL(markedItems, aTargetFolder);
+        }
     // Clean up
+    CleanupStack::PopAndDestroy(/*removedItems*/);
     CleanupStack::PopAndDestroy(/*markedItems*/);
     }
 
--- a/browserui/browser/FeedsSrc/FeedsFolderView.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFolderView.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -470,7 +470,11 @@
             }
         
         // Mark All
-        iApiProvider.FeedsClientUtilities().AddItemL(*aMenuPane, EAknMarkAll, R_OPTIONS_LIST_MARK_ALL);        
+        if (  iContainer && iContainer->iCurrentFolder &&
+                        iContainer->iCurrentFolder->GetChildren().Count() != iContainer->MarkedItems()->Count() )
+            {
+            iApiProvider.FeedsClientUtilities().AddItemL(*aMenuPane, EAknMarkAll, R_OPTIONS_LIST_MARK_ALL);
+            }
         
         // Unmark ALL
         if (AnyMarkedItems())
@@ -484,7 +488,14 @@
         
         }
     else if(aResourceId == R_FEEDS_FOLDER_MENU_PANE_CONTEXT_MENU) 
-        {
+            {
+            // move
+            if ( iContainer &&
+                    iContainer->iCurrentFolder &&
+                       iContainer->iCurrentFolder->GetChildren().Count() < 2 )
+                 {
+                    aMenuPane->SetItemDimmed(EFeedsMove,ETrue);
+                 }
             aMenuPane->SetItemDimmed(EFeedsMoveToFolder,ETrue);
 
             if (!(item->GetType() == EFolder))
@@ -497,7 +508,11 @@
                     aMenuPane->SetItemDimmed(EFeedsMoveToFolder,EFalse);
                     }            
                 }
-        }
+            else
+            	{
+            	aMenuPane->SetItemDimmed(EFeedsUpdate, ETrue);
+            	}
+            }
     iApiProvider.FeedsClientUtilities().DynInitMenuPaneL(aResourceId, aMenuPane );
     }
 
--- a/browserui/browser/SrcData/Feeds.rssi	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/SrcData/Feeds.rssi	Thu Sep 24 12:40:29 2009 +0300
@@ -240,6 +240,7 @@
     items =
         {
         MENU_ITEM { command = EFeedsUpdate; txt = qtn_feeds_update; },
+        MENU_ITEM { command = EFeedsUpdateAll; txt = qtn_feeds_update_all; },
         MENU_ITEM { command = EFeedsDelete; txt = qtn_fldr_delete; },
         MENU_ITEM { command = EFeedsMove; txt = qtn_options_org_move; },
         MENU_ITEM { command = EFeedsMoveToFolder; txt = qtn_options_org_move_to_folder; },
Binary file browserui/browser/conf/browserui.confml has changed
Binary file browserui/browser/conf/browserui_10008D39.crml has changed
Binary file browserui/browser/help/data/xhtml.zip has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browserui/browser/help/group/bld.inf	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - Initial contribution
+* 
+* Contributors:
+* 
+* 
+* Description:
+* Export help related files.
+*
+*/
+
+#include <platform_paths.hrh>	
+#include "../../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+			
+#if !defined(__PLATFORM_VERSION_32__) && !defined(__PLATFORM_VERSION_50__) && !defined(__PLATFORM_VERSION_50_TUBE__)
+
+PRJ_EXPORTS
+:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
+:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
+
+../inc/browser.hlp.hrh	APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/browser.hlp.hrh)
+../rom/browseruihelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(browseruihelps_variant.iby)
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browserui/browser/help/inc/browser.hlp.hrh	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,29 @@
+//
+// browser.hlp.hrh
+// 
+
+//
+// File generated by CSXHelp Utilities on 2009-05-26
+// 
+
+#ifndef __BROWSER_HLP_HRH__
+#define __BROWSER_HLP_HRH__
+
+_LIT(KOSS_HLP_BM_ADDBM, "OSS_HLP_BM_ADDBM"); // 
+_LIT(KOSS_HLP_RSS_ADD, "OSS_HLP_RSS_ADD"); // 
+_LIT(KOSS_HLP_PAGEVIEW, "OSS_HLP_PAGEVIEW"); // 
+_LIT(KOSS_HLP_BM_MAIN, "OSS_HLP_BM_MAIN"); // 
+_LIT(KOSS_HLP_BM_EDIT, "OSS_HLP_BM_EDIT"); // 
+_LIT(KOSS_HLP_RSS_EDIT, "OSS_HLP_RSS_EDIT"); // 
+_LIT(KOSS_HLP_SETTINGS_GENERAL, "OSS_HLP_SETTINGS_GENERAL"); // 
+_LIT(KOSS_HLP_SETTINGS_PAGE, "OSS_HLP_SETTINGS_PAGE"); // 
+_LIT(KOSS_HLP_SETTINGS_PRIVACY, "OSS_HLP_SETTINGS_PRIVACY"); // 
+_LIT(KOSS_HLP_RSS_ARTICLE, "OSS_HLP_RSS_ARTICLE"); // 
+_LIT(KOSS_HLP_SETTINGS_RSS, "OSS_HLP_SETTINGS_RSS"); // 
+_LIT(KOSS_HLP_RSS_ARTICLELST, "OSS_HLP_RSS_ARTICLELST"); // 
+_LIT(KOSS_HLP_PAGEVIEW_EMBED, "OSS_HLP_PAGEVIEW_EMBED"); // 
+_LIT(KOSS_HLP_SETTINGS_FOLDERS, "OSS_HLP_SETTINGS_FOLDERS"); // 
+_LIT(KOSS_HLP_RSS_MAIN, "OSS_HLP_RSS_MAIN"); // 
+_LIT(KOSS_HLP_SHORTCUTS, "OSS_HLP_SHORTCUTS"); // 
+
+#endif 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browserui/browser/help/rom/browseruihelps_variant.iby	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  IBY file for Browser Help
+*
+*/
+
+#ifndef __BROWSERUIHELPS_VARIANT_IBY__
+#define __BROWSERUIHELPS_VARIANT_IBY__
+
+#if defined(FF_S60_HELPS_IN_USE) /* && defined(__BROWSERUI_USED) */
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\contents.zip)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\index.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\keywords.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\meta.xml)
+#endif
+
+#endif
\ No newline at end of file
Binary file browserui/operatormenu/help/data/xhtml.zip has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browserui/operatormenu/help/group/bld.inf	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - Initial contribution
+* 
+* Contributors:
+* 
+* 
+* Description:
+* Export help related files.
+*
+*/
+
+#include <platform_paths.hrh>
+#include "../../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+			
+#if !defined(__PLATFORM_VERSION_32__) && !defined(__PLATFORM_VERSION_50__) && !defined(__PLATFORM_VERSION_50_TUBE__)
+				
+PRJ_EXPORTS
+:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
+:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
+
+../inc/ope.hlp.hrh	APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/ope.hlp.hrh)
+../rom/operatormenuhelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(operatormenuhelps_variant.iby)
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browserui/operatormenu/help/inc/ope.hlp.hrh	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,14 @@
+//
+// ope.hlp.hrh
+// 
+
+//
+// File generated by CSXHelp Utilities on 2009-04-17
+// 
+
+#ifndef __OPE_HLP_HRH__
+#define __OPE_HLP_HRH__
+
+_LIT(KOPERATOR_HLP_OPTIONS_LIST, "OPERATOR_HLP_OPTIONS_LIST"); // 
+
+#endif 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browserui/operatormenu/help/rom/operatormenuhelps_variant.iby	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  IBY file for Operatormenu Help
+*
+*/
+
+#ifndef __OPERATORMENUHELPS_VARIANT_IBY__
+#define __OPERATORMENUHELPS_VARIANT_IBY__
+
+#if defined(FF_S60_HELPS_IN_USE) && defined(__OPERATORMENU_USED)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\contents.zip)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\index.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\keywords.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\meta.xml)
+#endif
+
+#endif
\ No newline at end of file
Binary file pushmtm/help/data/xhtml.zip has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pushmtm/help/group/bld.inf	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - Initial contribution
+* 
+* Contributors:
+* 
+* 
+* Description:
+* Export help related files.
+*
+*/
+
+#include <platform_paths.hrh>	
+#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+			
+#if !defined(__PLATFORM_VERSION_32__) && !defined(__PLATFORM_VERSION_50__) && !defined(__PLATFORM_VERSION_50_TUBE__)
+			
+PRJ_EXPORTS
+:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
+:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
+
+../inc/wpush.hlp.hrh	APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/wpush.hlp.hrh)
+../rom/pushmtmhelps_variant.iby		CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(pushmtmhelps_variant.iby)
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pushmtm/help/inc/wpush.hlp.hrh	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,15 @@
+//
+// wpush.hlp.hrh
+// 
+
+//
+// File generated by CSXHelp Utilities on 2009-04-17
+// 
+
+#ifndef __WPUSH_HLP_HRH__
+#define __WPUSH_HLP_HRH__
+
+_LIT(KWPUSH_HLP_SETTINGS, "WPUSH_HLP_SETTINGS"); // 
+_LIT(KWPUSH_HLP_VIEWER, "WPUSH_HLP_VIEWER"); // 
+
+#endif 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pushmtm/help/rom/pushmtmhelps_variant.iby	Thu Sep 24 12:40:29 2009 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  IBY file for PushMtmHelps
+*
+*/
+
+#ifndef __PUSHMTMHELPS_VARIANT_IBY__
+#define __PUSHMTMHELPS_VARIANT_IBY__
+
+#if defined(FF_S60_HELPS_IN_USE) && defined(__PUSHMTM_USED)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\contents.zip)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\index.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\keywords.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\meta.xml)
+#endif
+
+#endif
\ No newline at end of file