--- a/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp	Mon Oct 26 08:18:09 2009 +0200
@@ -37,6 +37,7 @@
 END
 
 START RESOURCE  ../data/BrowserAudioVideoPlugin.rss
+DEPENDS avkon.rsg
 HEADER
 TARGET      BrowserAudioVideoPlugin.rsc       
 TARGETPATH  RESOURCE_FILES_DIR 

--- a/browserui/browser/BrowserAppInc/BrowserPreferences.h	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserPreferences.h	Mon Oct 26 08:18:09 2009 +0200
@@ -974,6 +974,9 @@
         * To get cursor show mode
         */
         inline TBrCtlDefs::TCursorSettings CursorShowMode() const;
+        
+        inline TBrCtlDefs::TEnterKeySettings EnterKeyMode() const;
+        
     private:
 
         /**

--- a/browserui/browser/BrowserAppInc/BrowserPreferences.inl	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserPreferences.inl	Mon Oct 26 08:18:09 2009 +0200
@@ -681,6 +681,15 @@
     return iAllPreferences.iService;        
     }
 
+// ---------------------------------------------------------
+// CBrowserPreferences::EnterKeyMode()
+// ---------------------------------------------------------
+//
+TBrCtlDefs::TEnterKeySettings CBrowserPreferences::EnterKeyMode() const
+    {
+    return iAllPreferences.iEnterKeyMode;
+    }    
+
 #endif
 
 // End of File

--- a/browserui/browser/BrowserAppInc/Preferences.h	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppInc/Preferences.h	Mon Oct 26 08:18:09 2009 +0200
@@ -137,6 +137,7 @@
     TBool                           iSearch;                // Search Feature
     TBool                           iService;               // Service Feature
     TBrCtlDefs::TCursorSettings     iCursorShowMode;
+    TBrCtlDefs::TEnterKeySettings     iEnterKeyMode;
     };
 
 /**
@@ -837,6 +838,10 @@
 	    */  
         virtual TBrCtlDefs::TCursorSettings CursorShowMode() const = 0;  
 
+       /**
+        * Enter key mode
+        */
+        virtual TBrCtlDefs::TEnterKeySettings EnterKeyMode() const = 0;
 
     public:     // observer support
 

--- a/browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserAppEntryPoint.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -20,6 +20,7 @@
 
 #include "BrowserApplication.h"
 #include <e32std.h>
+#include <u32std.h>
 #include <eikapp.h>
 #include <eikstart.h>
 #include "MemoryManager.h"
@@ -32,22 +33,41 @@
     return new CBrowserApplication;
     }
 
+EXPORT_C TInt UserHeap::SetupThreadHeap(TBool, SStdEpocThreadCreateInfo& aInfo)
+	{
+    TInt r = KErrNone;
+    if (!aInfo.iAllocator && aInfo.iHeapInitialSize>0)
+		{
+		// new heap required
+		RHeap* pH = NULL;
+		r = CreateThreadHeap(aInfo, pH);
+		if (r == KErrNone)
+			{       // should happen for main thread, otherwise panic      
+					RAllocator* oldAllocator = MemoryManager::SwitchToFastAllocator();
+			}
+		}
+	else if (aInfo.iAllocator)
+		{
+		// sharing a heap
+		RAllocator* pA = aInfo.iAllocator;
+		pA->Open();
+		User::SwitchAllocator(pA);
+		}
+
+    return r;
+	}
+
 GLDEF_C TInt E32Main()
     {
     ROomMonitorSession oomMs;
-    TInt result = oomMs.Connect();
-    if ( result == KErrNone )
+    TInt r = oomMs.Connect();
+    if (r == KErrNone)
         {
-        result = oomMs.RequestFreeMemory( KFreeMemoryTarget );
+        r = oomMs.RequestFreeMemory(KFreeMemoryTarget);
         oomMs.Close();
-        if ( result == KErrNone )
-            {
-            RAllocator* oldAllocator = MemoryManager::SwitchToFastAllocator();
-            result = EikStart::RunApplication( NewApplication );
-            MemoryManager::CloseFastAllocator(oldAllocator);
-            }
         }
-    return result;
+    
+	return EikStart::RunApplication(NewApplication);
     }
 
 //  End of File  

--- a/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -207,10 +207,11 @@
         iApiProvider.BrCtlInterface().FocusedElementType();
 
     // Don't allow virtual keyboard backspace key event to close the window
-    // And don't close window if editing in an input box
+    // And don't close window if editing in an input box or textarea input 
     if ( !AknLayoutUtils::PenEnabled() && aType == EEventKey
         && keyEvent.iCode == EKeyBackspace
-        && elementtype != TBrCtlDefs::EElementActivatedInputBox )
+        && elementtype != TBrCtlDefs::EElementActivatedInputBox 
+        && elementtype != TBrCtlDefs::EElementTextAreaBox )
         {
         if ( iApiProvider.Preferences().UiLocalFeatureSupported(
                                                     KBrowserMultipleWindows ) )
@@ -270,7 +271,10 @@
     // The commented part below enables the "Open link in new window" option on long press.
     // UI change request AHUN-6U3NT4, S60 bug AHUN-6UYT6N
 
-    if ( aType == EEventKey && keyEvent.iCode == EKeyOK )
+    TBool aEnterKeyForLinksActivation = (keyEvent.iCode == EKeyEnter) && 
+        (iApiProvider.Preferences().EnterKeyMode() == TBrCtlDefs::EEnterKeyCanActivateLink);
+    if ( aType == EEventKey && 
+         (keyEvent.iCode == EKeyOK || aEnterKeyForLinksActivation) )
         {
         if ( keyEvent.iRepeats && iSelectionKeyPressed )
             {
@@ -301,7 +305,9 @@
         }
 
     // stop the event handling when find item was actived
-    if ( (keyEvent.iScanCode == EStdKeyDevice3 || keyEvent.iScanCode == EStdKeyXXX)
+    if ( (keyEvent.iScanCode == EStdKeyDevice3 || 
+          keyEvent.iScanCode == EStdKeyXXX ||
+          aEnterKeyForLinksActivation)
         && aType == EEventKeyDown && !iView->FindItemIsInProgress() )
         {
         iSelectionKeyPressed = ETrue;

--- a/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -255,8 +255,7 @@
                 !LoadStatus( ELoadStatusFirstChunkArrived ) && 
                 !iApiProvider->ExitInProgress() )
                 {
-                // Go back to bookmarks and close the content view
-				iApiProvider->ExitBrowser( ETrue );
+                // Don't do anything; let the embedder close the browser
                 }
             // No content to be shown, go back to where we came from
             else if ( !iRestoreContentFlag  )

--- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -721,7 +721,8 @@
     iAllPreferences.iSearch = GetIntValue( KBrowserSearch );
     iAllPreferences.iService = GetIntValue( KBrowserServices );
     iAllPreferences.iCursorShowMode = (TBrCtlDefs::TCursorSettings)GetIntValue( KBrowserCursorShowMode );
-	}
+    iAllPreferences.iEnterKeyMode = (TBrCtlDefs::TEnterKeySettings)GetIntValue( KBrowserEnterKeyMode );
+    }
 
 
 // ----------------------------------------------------------------------------

--- a/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserSpecialLoadObserver.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -42,6 +42,7 @@
 #include <BrowserNG.rsg>
 #include <FeatMgr.h>
 #include <AiwGenericParam.h>
+#include <aknnavi.h>
 
 //CONSTANTS
 const TInt KMaxDocHandlerUrlLen = 255;
@@ -314,6 +315,7 @@
                 	(previousViewID != KUidBrowserFeedsTopicViewId) &&
                 	(previousViewID != KUidBrowserFeedsFeedViewId) )
                 	{
+                	iApiProvider->Display().NaviPaneL()->Pop();
         	        CBrowserAppUi::Static()->CloseContentViewL();
                 	}
 #else //__RSS_FEEDS           

--- a/browserui/browser/BrowserAppSrc/BrowserWindow.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserWindow.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -839,6 +839,15 @@
                                         Preferences().CursorShowMode() );
             break; 
             }
+            
+        case TBrCtlDefs::ESettingsEnterKeyMode:
+            {
+            iBrCtlInterface->SetBrowserSettingL(
+                                        TBrCtlDefs::ESettingsEnterKeyMode,
+                                        Preferences().EnterKeyMode() );
+            break; 
+            }
+
         // LOCAL SETTINGS should be ignored
         case TBrCtlDefs::ESettingsTextWrapEnabled:
         case TBrCtlDefs::ESettingsFontSize:
@@ -930,6 +939,8 @@
 	UpdateGlobalPreferencesL( TBrCtlDefs::ESettingsZoomLevelDefault );
 
 	UpdateGlobalPreferencesL( TBrCtlDefs::ESettingsCursorShowMode );
+	UpdateGlobalPreferencesL( TBrCtlDefs::ESettingsEnterKeyMode );
+	
     // Font Size - LOCAL Setting
     iBrCtlInterface->SetBrowserSettingL( TBrCtlDefs::ESettingsFontSize,
             iWindowManager->ApiProvider()->Preferences().FontSize() );

--- a/browserui/browser/FavouritesInc/BrowserBookmarksView.h	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/FavouritesInc/BrowserBookmarksView.h	Mon Oct 26 08:18:09 2009 +0200
@@ -460,6 +460,7 @@
         */
         void AddUidToLastPlaceToCurrentListL( TInt aUid );
 
+    public:
         /**
         * Dim or Un-dim Toolbar buttons.
         */

--- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h	Mon Oct 26 08:18:09 2009 +0200
@@ -492,10 +492,15 @@
         virtual TKeyResponse OfferKeyEventL
             ( const TKeyEvent& aKeyEvent, TEventCode aType );
 
-		/**
+        /**
         * Reset state with deactivation event
         */
-		void ResetStateInDeActivation();
+        void ResetStateInDeActivation();
+
+        /**  
+        * Needed for updating tool bar buttons when there is a up/down arrow key events received.  
+        **/  
+        virtual void UpdateToolbarButtonsState(); 
 
     private:    // from MWmlBrowserFavouritesModelObserver
 

--- a/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -412,7 +412,7 @@
 
             // Enter Key now handled through HandleCommand in BrowserBookmarksView like MSK
             // This change affects the enter key on the QWERTY keyboard when we run emulator
-            if ( EStdKeyEnter == aKeyEvent.iScanCode && EEventKeyUp == aType &&
+            if ( EStdKeyEnter == aKeyEvent.iScanCode && EEventKey == aType &&
                  AknLayoutUtils::MSKEnabled() &&
                  ( iGotoPaneActive || iSearchPaneActive ) )
                 {

--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -1483,6 +1483,11 @@
                 aMenuPane->SetItemDimmed( EWmlCmdSwitchToGotoActive, ETrue );
                 aMenuPane->SetItemDimmed( EWmlCmdNewFolder, ETrue );
                 }
+                
+            if( iContainer && iContainer->Listbox() && !iContainer->Listbox()->AnyFoldersL() )
+                {
+                aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+                }
             const CFavouritesItem* item =  TheContainer()->Listbox()->CurrentItem();
             if  ( ( item ) &&
                   ( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) ||
@@ -1496,10 +1501,23 @@
                 }
                 
             //Enable CopyToBookmarks option if you are in RecentlyVisitedUrl folder
-			if( iInAdaptiveBookmarksFolder )
-				{
-				aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, EFalse );
-				}
+            if( iInAdaptiveBookmarksFolder )
+            	{
+            	aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, EFalse );
+            	}
+            //judge the selected items include RecentlyVisitedUrl folder or not, if include set "copy to bookmarks" dim
+            CArrayPtr<const CFavouritesItem>* items = Container()->Listbox()->SelectedItemsLC();
+            if (items->Count())
+                {
+                for (TInt i=0;i<items->Count();i++)
+				    {
+				    if((*items)[i]->Uid() == KFavouritesAdaptiveItemsFolderUid )
+				        {
+			            aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, ETrue );
+			            }
+			        }
+                }
+            CleanupStack::PopAndDestroy();//items
             break;
             }
         default:
@@ -2752,6 +2770,10 @@
                                 || (!state.AnyDeletable());
 
         Toolbar()->SetItemDimmed( EWmlCmdDelete, needToDimDeleteBtn, ETrue );
+        //set EWmlCmdAddBookmark dim in RecentlyVisitedUrl Folder
+        Toolbar()->SetItemDimmed( EWmlCmdAddBookmark, iInAdaptiveBookmarksFolder, ETrue);
+       
+        
         }
     }
 // End of File

--- a/browserui/browser/FavouritesSrc/BrowserFavouritesContainer.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesContainer.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -49,6 +49,7 @@
 #include "BrowserFavouritesListbox.h"
 #include "BrowserFavouritesListboxModel.h"
 #include "BrowserFavouritesListboxIconHandler.h"
+#include "logger.h" 
 
 // CONSTANTS
 LOCAL_D const TInt KTabId = 88888;
@@ -217,6 +218,13 @@
         // Otherwise, let the listbox fiddle with it. This will NOT consume
         // arrow presses (base class overridden).
         result = iListbox->OfferKeyEventL( aKeyEvent, aType );
+        
+        if( (aKeyEvent.iCode == EKeyDownArrow) || (aKeyEvent.iCode == EKeyUpArrow) )  
+                {  
+                BROWSER_LOG( ( _L("Need to update tool bar buttons") ) );  
+                iView->UpdateToolbarButtonsState();  
+                }  
+
         }
 
     return result;

--- a/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp	Mon Oct 26 08:18:09 2009 +0200
@@ -60,6 +60,7 @@
 #include "CommsModel.h"
 #include "Display.h"
 #include "Preferences.h"
+#include "logger.h" 
 
 #include "eikon.hrh"
 
@@ -1812,4 +1813,10 @@
     MenuBar()->SetMenuType(CEikMenuBar::EMenuOptions);  // adds task swapper menu item first
     }
 
+void CBrowserFavouritesView::UpdateToolbarButtonsState()  
+    {  
+    LOG_ENTERFN("CBrowserFavouritesView::UpdateToolbarButtonsState");    
+    BROWSER_LOG( ( _L("Implementation is not required here") ) );  
+    }  
+
 // End of File

--- a/browserui/browser/Group/BrowserCommon.mmpi	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/Group/BrowserCommon.mmpi	Mon Oct 26 08:18:09 2009 +0200
@@ -20,9 +20,13 @@
 TARGETTYPE  exe
 
 EPOCSTACKSIZE 0x14000
-EPOCHEAPSIZE 0x5000 0x1000000
+
+// There is no need to set a custom heap size as a custom allocator is used so the default values of 1 KB for
+// minimum and 1 MB for maximum should be used instead.  These will be used for a short time at startup for
+// the default heap, which in turn is used to create the custom allocator. no gain in functionality
+//EPOCHEAPSIZE 0x5000 0x1000000
+
 VENDORID    VID_DEFAULT
-
 CAPABILITY CAP_APPLICATION NetworkControl -Location
 
 EpocAllowDllData

--- a/browserui/browser/Group/BrowserNG.mmp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/browser/Group/BrowserNG.mmp	Mon Oct 26 08:18:09 2009 +0200
@@ -46,6 +46,7 @@
 #endif
 
 START RESOURCE ../SrcData/BrowserNG.rss
+DEPENDS avkon.rsg
 TARGETPATH APP_RESOURCE_DIR
 HEADER
 #ifdef __S60_32__
@@ -57,7 +58,7 @@
 
 START RESOURCE ../SrcData/BrowserNG_reg.rss
 DEPENDS browserng.rsg
-
+DEPENDS avkon.rsg
 // Do not change the UID below.
 TARGETPATH /private/10003a3f/apps
 END

Binary file browserui/browser/conf/browserui.confml has changed

Binary file browserui/browser/conf/browserui_10008D39.crml has changed

--- a/browserui/operatormenu/group/OperatorMenu.mmp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/operatormenu/group/OperatorMenu.mmp	Mon Oct 26 08:18:09 2009 +0200
@@ -36,6 +36,7 @@
 SOURCE  OperatorMenuDocument.cpp
 
 START RESOURCE ../data/Operatormenu.rss
+DEPENDS avkon.rsg
 HEADER
 TARGETPATH      APP_RESOURCE_DIR
 #ifdef __S60_32__

--- a/browserui/videoservices/group/VideoServices.mmp	Thu Sep 24 12:40:29 2009 +0300
+++ b/browserui/videoservices/group/VideoServices.mmp	Mon Oct 26 08:18:09 2009 +0200
@@ -37,6 +37,7 @@
 SOURCE  VideoServicesContainer.cpp
 
 START RESOURCE ../data/VideoServices.rss
+DEPENDS avkon.rsg
 HEADER
 TARGETPATH      APP_RESOURCE_DIR
 

--- a/pushmtm/Group/PushMtmUi.mmp	Thu Sep 24 12:40:29 2009 +0300
+++ b/pushmtm/Group/PushMtmUi.mmp	Mon Oct 26 08:18:09 2009 +0200
@@ -31,6 +31,7 @@
 VENDORID        VID_DEFAULT
 
 START RESOURCE  ../Data/PushMtmUi.rss
+DEPENDS avkon.rsg
 HEADER
 #ifdef __S60_32__
 LANG sc 

--- a/pushmtm/Group/PushViewer.mmp	Thu Sep 24 12:40:29 2009 +0300
+++ b/pushmtm/Group/PushViewer.mmp	Mon Oct 26 08:18:09 2009 +0200
@@ -80,6 +80,7 @@
 
 
 START RESOURCE  ../Data/PushViewer.rss
+DEPENDS avkon.rsg
 HEADER
 #ifdef __S60_32__
 LANG sc