# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1279208524 -10800
# Node ID 5a044f6358c2803fbe773c30c60975edf29fe282
# Parent  b149f0820e5aa66ab093779bfda51061a6a25aff
Revision: 201026
Kit: 2010127

diff -r b149f0820e5a -r 5a044f6358c2 browserplugins/browseraudiovideoplugin/src/BavpController.cpp
--- a/browserplugins/browseraudiovideoplugin/src/BavpController.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserplugins/browseraudiovideoplugin/src/BavpController.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -44,7 +44,9 @@
 
 // CONSTANTS
 const TInt KBavpMaxLinkFileSize = 5120; // 5kB
+#ifdef __PLATFORM_VERSION_32__
 const TInt KRectPadding = 2;
+#endif
 
 // Define our static BavpController array
 RPointerArray<CBavpController> CBavpController::iBavpControllerArray;
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/BrowserAppInc/BrowserAppUi.h
--- a/browserui/browser/BrowserAppInc/BrowserAppUi.h	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserAppUi.h	Thu Jul 15 18:42:04 2010 +0300
@@ -817,7 +817,7 @@
         * @param none
         */		
 		void StartFetchHomePageL();		
-        TUid FindAppIdL(TUid aMessageUid);
+        TBool IsSameWinApp(TUid aMessageUid);
 #ifdef BRDO_OCC_ENABLED_FF
         //For Call back for reconnectivity
         static TInt RetryConnectivity(TAny* aCBrowserAppUi);
@@ -1114,7 +1114,7 @@
         RFs iFs;
         CIdle* iDelayedUpdate;
 #endif        
-        TBool iCalledFromExternApp;
+        TBool iSameWinApp;
         TInt iWindowIdFromFromExternApp;
 	protected:
 
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/BrowserAppSrc/BrowserAppUi.cpp
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -162,7 +162,7 @@
 iPgNotFound( EFalse ),
 iOverriddenLaunchContextId( EBrowserContextIdNormal ),
 iBrowserAlreadyRunning (EFalse),
-iCalledFromExternApp( EFalse ),
+iSameWinApp( EFalse ),
 iFeedsClientUtilities( 0 )
     {
     iViewToBeActivatedIfNeeded.iUid = 0;
@@ -342,8 +342,8 @@
     {
     LOG_ENTERFN("CBrowserAppUi::CheckUpdatesComplete");
     LOG_WRITE( "CBrowserAppUi::CheckUpdatesComplete - Entry" );
-    TInt err;
-    TBool result;
+
+    TBool result = EFalse;
     TBool showDialog = EFalse;
 
     if ( aErrorCode == KErrNone )
@@ -2150,8 +2150,6 @@
     	        
     	        HBufC* buf = HBufC::NewLC( KMaxHomePgUrlLength );  // cleanupstack
     	        TPtr ptr( buf->Des() );
-    	        TInt pgFound( KErrNotFound );
-    	        pgFound = Preferences().HomePageUrlL( ptr );
     	        
     			HBufC* searchScheme = HBufC::NewLC( KMaxHomePgUrlLength );  // cleanupstack
     			TPtr searchSchemePtr( searchScheme->Des() );
@@ -2460,7 +2458,7 @@
                                 CBrowserWindow *win = NULL; 
                                 if(WindowMgr().CurrentWindow()) 
                                 {
-                                    if(iCalledFromExternApp)
+                                    if(iSameWinApp)
                                     {
                                         //We will be using same/already opened window if call is from external
                                         //application. So no new windows will be opened.
@@ -3176,13 +3174,8 @@
     TUid wapUid = KUidBrowserApplication;
     TApaTask task = taskList.FindApp( wapUid );
     task.BringToForeground();
-    //Check for aMessageUid. If it is in array then set iCalledFromExternApp = ETrue
-    TUid aAppId;
-    TRAPD(err, aAppId = FindAppIdL(aMessageUid););
-    if(!err && (aMessageUid == aAppId))
-    {
-        iCalledFromExternApp = ETrue;
-    }
+    //Check for aMessageUid. If it is in array then set iSameWinApp = ETrue
+    iSameWinApp = IsSameWinApp(aMessageUid); 
     if ( aMessageParameters.Compare( KLongZeroIdString ) )
         {
         ParseAndProcessParametersL( aMessageParameters );
@@ -4096,7 +4089,7 @@
     if(aWindowId == iWindowIdFromFromExternApp)
     {
         //Make it false as window is going to close down
-        iCalledFromExternApp = EFalse;
+        iSameWinApp = EFalse;
     }
 #ifdef __RSS_FEEDS
 	// If we are closing a Feeds Full Story then go back to feeds
@@ -4293,12 +4286,8 @@
 	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);
 		    }
-		}
 	else if(aEventType == KAppOomMonitor_MemoryGood)
 		{
         BrCtlInterface().HandleCommandL( (TInt)TBrCtlDefs::ECommandMemoryGood + (TInt)TBrCtlDefs::ECommandIdBase);
@@ -4717,7 +4706,6 @@
 // ---------------------------------------------------------
 TInt64 CBrowserAppUi::ReadUpdateFile()
     {
-    TBool returnvalue = ETrue;
     TBuf<KMaxFileName> privatePath;
     TBuf<KMaxFileName> updateFileName;
     //Get the private path then append the filename
@@ -4744,18 +4732,16 @@
     }
 #endif
 
-TUid CBrowserAppUi::FindAppIdL(TUid aMessageUid)
-{
-    TUid aRetVal = TUid::Uid(NULL);
+TBool CBrowserAppUi::IsSameWinApp(TUid aMessageUid)
+{      
     TInt nElements = sizeof(mArrayOfExternalAppUid)/sizeof(TInt);
     for(TInt nIndex = 0;nIndex < nElements; nIndex++)
     {
         if(aMessageUid == TUid::Uid(mArrayOfExternalAppUid[nIndex]))
         {
-            aRetVal = TUid::Uid(mArrayOfExternalAppUid[nIndex]);
-            break;
+        return ETrue; 
         }
     }
-    return aRetVal;
+    return EFalse;
 }
 // End of File
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/BrowserAppSrc/BrowserContentView.cpp
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -1033,10 +1033,7 @@
     if ( AppUi()->GetActiveViewId( activeViewId ) == KErrNone )
         {
         if ( activeViewId.iViewUid == KUidBrowserContentViewId )
-            {
-            TBool sizeChangedCba = EFalse;
-            TBool sizeChangedSP = EFalse;
-            
+            { 
             if ( iContentFullScreenMode )
                 {
                 SetContentContainerRect();
@@ -1054,7 +1051,6 @@
                     {
                     if(StatusPane()->IsVisible())
                         {
-                        sizeChangedSP = ETrue;
                         StatusPane()->MakeVisible(EFalse);
                         }
                     }
@@ -1062,16 +1058,13 @@
                     {
                     if(!StatusPane()->IsVisible())
                         {
-                        sizeChangedSP = ETrue;
                         ShowFsStatusPane(ETrue);
                         }
                     }
                 }
             else
                 {
-                sizeChangedCba = !Cba()->IsVisible();
                 Cba()->MakeVisible( ETrue );
-                sizeChangedSP = !StatusPane()->IsVisible();
                 StatusPane()->MakeVisible( ETrue );
                 }
 
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/BrowserAppSrc/BrowserDialogs.cpp
--- a/browserui/browser/BrowserAppSrc/BrowserDialogs.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserDialogs.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -195,7 +195,7 @@
 								( REINTERPRET_CAST( CEikDialog**, &dialog ) );
     dialog->PrepareLC( aDialogResourceId ) ;
     dialog->SetCurrentLabelL( EGeneralNote, aPrompt );
-    dialog->RunDlgLD( CAknNoteDialog::ELongTimeout, CAknNoteDialog::ENoTone );
+    dialog->RunDlgLD( CAknNoteDialog::EShortTimeout , CAknNoteDialog::ENoTone );
     }
 
 
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/BrowserAppSrc/BrowserWindow.cpp
--- a/browserui/browser/BrowserAppSrc/BrowserWindow.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserWindow.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -65,6 +65,7 @@
 //
 TBool CBrowserWindow::CompleteDelayedInit()
     {    
+    return EFalse;
     }
 
 CBrowserWindow* CBrowserWindow::NewLC(
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -767,8 +767,11 @@
                      }
                  else
                      {
-                     CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
-                     SetGotoInactiveL();
+                         if(aPointerEvent.iType == TPointerEvent::EButton1Down )
+                         {
+                             CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
+                             SetGotoInactiveL();
+                         }
                      }
                 }
              else
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -717,8 +717,11 @@
             }
         else
             {
-            // pointer outside of control
-            CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
+                if(aPointerEvent.iType == TPointerEvent::EButton1Down)
+                {
+                    // pointer outside of control
+                    CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
+                }
             }
         }
     }
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -1126,7 +1126,12 @@
     //Make it true so that latest FavIcon db info is shown     
     iRefresh = ETrue;
 
-#ifndef BRDO_PERF_IMPROVEMENTS_ENABLED_FF
+#ifdef BRDO_PERF_IMPROVEMENTS_ENABLED_FF 
+    if ( ApiProvider().Preferences().SearchFeature() ) // hide the button which is not needed
+        Toolbar()->HideItem( EWmlCmdGoToAddress, ETrue , EFalse);
+    else
+        Toolbar()->HideItem( EWmlCmdGoToAddressAndSearch, ETrue , EFalse);
+#else
     Toolbar()->HideItem( EWmlCmdAddBookmark, ETrue , EFalse);
     
     //disable both the goto items and activate one of them depending on availability of search feature during bookmarks activation 
@@ -1586,7 +1591,7 @@
                 {
                 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
                 }
-            const CFavouritesItem* item;
+            const CFavouritesItem* item = NULL;
             if(TheContainer() && TheContainer()->Listbox()) 
                item =  TheContainer()->Listbox()->CurrentItem();
                
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp
--- a/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -247,8 +247,9 @@
           iIsActivated( EFalse ),
           iLastSelection( 0 ),
           iUpdatePending( EFalse ),
-          iRefresh( ETrue ),
-          iFavViewRefresh(0)
+          iFavViewRefresh(0),
+          iRefresh( ETrue )
+          
     {
     }
 
@@ -1149,9 +1150,13 @@
 
         iCurrentFolder = aFolder;
         FillListboxL( aFolder, /*aKeepState=*/EFalse );
-                
-        Container()->Listbox()->ClearSelection(); // is it needed ?
-        UpdateCbaL();
+        
+        if(ApiProvider().StartedUp())
+            {
+            Container()->Listbox()->ClearSelection();
+            UpdateCbaL();
+            }
+        
         UpdateNaviPaneL();
         }
     CleanupStack::PopAndDestroy();  // folder
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp
--- a/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -342,7 +342,7 @@
         CEikEdwin* edwin = NULL;
         edwin = static_cast<CEikEdwin*>(ControlOrNull(EFeedsEditDialogUrlId));
         if(edwin)
-        edwin->SetAknEditorFlags(EAknEditorFlagNoT9);
+            edwin->SetAknEditorFlags(EAknEditorFlagNoT9 | EAknEditorFlagUseSCTNumericCharmap);
         }
     else if(aControlId == EFeedsEditAutomaticUpdatingId) 
         {
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FeedsSrc/FeedsFeedContainer.cpp
--- a/browserui/browser/FeedsSrc/FeedsFeedContainer.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFeedContainer.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -46,6 +46,7 @@
 #include <feedattributes.h>
 #include <folderattributes.h>
 #include <feedsentity.h>
+#include <BidiText.h>
 
 #include "eikon.hrh"
 
@@ -61,7 +62,9 @@
 _LIT(KTokenEnclosure, "#Enclosure#");
 _LIT(KTokenShowPrev, "#ShowPrev#");
 _LIT(KTokenShowNext, "#ShowNext#");
-
+_LIT(KTokenTextDir, "#dir#");
+_LIT(KLTRTextDir, "\"ltr\"");
+_LIT(KRTLTextDir, "\"rtl\"");
 
 const TInt KDateSize = 30;          // Size of Date strings
 const TInt KTimeSize = 30;          // Size of Time strings
@@ -956,7 +959,26 @@
     // Resolve the tokens.
     TPtr  ucs2Ptr(ucs2Buff->Des());
 
-    // Replace the title tokens.
+    // Add the text direction information here
+    TBool found(EFalse);
+	TBidiText::TDirectionality dir = TBidiText::TextDirectionality(aTitle, &found);
+	TBuf<5> textDirection;
+	if ( dir == TBidiText::ERightToLeft )
+		{
+		textDirection.Copy(KRTLTextDir);
+		}
+	else
+		{
+		textDirection.Copy(KLTRTextDir);
+		}
+	
+	// replace the text direction string
+	if ((loc = ucs2Ptr.Find(KTokenTextDir())) != KErrNotFound)
+		{
+		ucs2Ptr.Replace(loc, textDirection.Length(), textDirection);
+		}
+	
+	// Replace the title tokens.
     while ((loc = ucs2Ptr.Find(KTokenTitle())) != KErrNotFound)
         {
         ucs2Ptr.Replace(loc, KTokenTitle().Length(), aTitle);
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FeedsSrc/FeedsTopicContainer.cpp
--- a/browserui/browser/FeedsSrc/FeedsTopicContainer.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsTopicContainer.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -602,7 +602,15 @@
         {
         iNaviDecorator = naviPane->CreateNavigationLabelL( timestamp );
         }
-
+    else
+        {
+        CAknNaviLabel* naviLabel = static_cast<CAknNaviLabel*>(iNaviDecorator->DecoratedControl());
+		if(naviLabel)
+			{
+	        naviLabel->SetTextL(timestamp);
+			}
+        }
+    
 
 	// If not yet pushed, this will do the push; if already there, this brings
     // it to top and draws.
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/FeedsSrc/FeedsTopicView.cpp
--- a/browserui/browser/FeedsSrc/FeedsTopicView.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsTopicView.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -289,7 +289,7 @@
 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF
     Toolbar()->SetToolbarVisibility(EFalse,EFalse);
     return;
-#endif    
+#else    
     if (iApiProvider.IsPageLoaded())
         {
         Toolbar()->SetItemDimmed(EFeedsBackToPage, EFalse, ETrue);     
@@ -306,6 +306,7 @@
         {
         Toolbar()->SetItemDimmed(EFeedsOpen, ETrue, ETrue);            
         }
+#endif
     }
 
 // ---------------------------------------------------------------------------
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/SettingsSrc/SettingsContainer.cpp
--- a/browserui/browser/SettingsSrc/SettingsContainer.cpp	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/SettingsSrc/SettingsContainer.cpp	Thu Jul 15 18:42:04 2010 +0300
@@ -1250,7 +1250,7 @@
     CleanupStack::PopAndDestroy(); // defaultAp
     aItemText.Append( KWmlSettingsListBoxItemPostfix );
     
-    if ( id == -1 )
+    if ( id == KWmlNoDefaultAccessPoint )
         {
         // If user hasn't selected an AP, show a blank list entry. Once user
         // selects an AP, it will be displayed.  Note: The browser's default AP
@@ -3362,7 +3362,6 @@
 //
 void CSettingsContainer::HandleListBoxEventL(CEikListBox* aListBox,TListBoxEvent aEventType)
     {
-    TKeyResponse ret = EKeyWasNotConsumed;
     if (iPenEnabled)
         {
         if (iSettingListBox && aListBox == iSettingListBox)
@@ -3446,7 +3445,6 @@
                         case EWmlSettingsSearchProvider:
                         {
                             ChangeItemL( ETrue );
-                            ret = EKeyWasConsumed;
                             break;
                         }
                         default:
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/SrcData/Browser.rss
--- a/browserui/browser/SrcData/Browser.rss	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/SrcData/Browser.rss	Thu Jul 15 18:42:04 2010 +0300
@@ -124,7 +124,7 @@
     {
     hotkeys = r_browser_hotkeys;
     menubar = r_menu_bar;
-    cba = r_browser_default_buttons;
+    cba = r_browser_options_menu_during_download;
 #ifdef RD_SCALABLE_UI_V2
     toolbar = r_content_view_toolbar;
 #endif
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/SrcData/BrowserBookmarks.rssi
--- a/browserui/browser/SrcData/BrowserBookmarks.rssi	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/SrcData/BrowserBookmarks.rssi	Thu Jul 15 18:42:04 2010 +0300
@@ -34,7 +34,7 @@
 RESOURCE AVKON_VIEW r_browser_bookmarks_view
 	{
 	menubar = r_browser_bookmarks_menu_bar;
-	cba = R_AVKON_SOFTKEYS_EMPTY;   // CBA commands are set dynamically
+	cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;   // CBA commands are set dynamically
     toolbar = r_bookmark_view_toolbar; 	
 	}
 
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/SrcData/bookmark_toolbar.rssi
--- a/browserui/browser/SrcData/bookmark_toolbar.rssi	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/SrcData/bookmark_toolbar.rssi	Thu Jul 15 18:42:04 2010 +0300
@@ -81,7 +81,29 @@
                         }
                     };
                 };
-            },            
+            }, 
+           
+        TBAR_CTRL //Search Goto
+            {
+            type = EAknCtButton;
+            id = EWmlCmdGoToAddressAndSearch;     
+            control = AVKON_BUTTON
+                {
+                flags = 0;
+                states =
+                    {
+                    AVKON_BUTTON_STATE
+                        {
+                        txt     = "";  //Icon should always be visible instead of this
+                        helptxt = qtn_is_tooltip_goto_search;
+                        bmpfile = "\\Resource\\apps\\browser.mif";
+                        bmpid   = EMbmBrowserQgn_indi_browser_tb_goto_and_search;         
+                        bmpmask = EMbmBrowserQgn_indi_browser_tb_goto_and_search_mask;
+                        extension = r_browser_ext_qgn_indi_browser_tb_goto_and_search;
+                        }
+                    };
+                };
+            }, 
 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF	    
             TBAR_CTRL
                         {
@@ -127,31 +149,9 @@
                         }
                     };
                 };
-            }	
- #endif
-	,
-    TBAR_CTRL //Search Goto
-        {
-        type = EAknCtButton;
-        id = EWmlCmdGoToAddressAndSearch;     
-        control = AVKON_BUTTON
-            {
-            flags = 0;
-            states =
-                {
-                AVKON_BUTTON_STATE
-                    {
-                    txt     = "";  //Icon should always be visible instead of this
-                    helptxt = qtn_is_tooltip_goto_search;
-                    bmpfile = "\\Resource\\apps\\browser.mif";
-                    bmpid   = EMbmBrowserQgn_indi_browser_tb_goto_and_search;         
-                    bmpmask = EMbmBrowserQgn_indi_browser_tb_goto_and_search_mask;
-                    extension = r_browser_ext_qgn_indi_browser_tb_goto_and_search;
-                    }
-                };
-            };
-        }	
-      };
+            }		
+ #endif           
+        };
     }
 
 #else
diff -r b149f0820e5a -r 5a044f6358c2 browserui/browser/SrcData/feeds_view_template.html
--- a/browserui/browser/SrcData/feeds_view_template.html	Mon Jun 21 15:43:41 2010 +0300
+++ b/browserui/browser/SrcData/feeds_view_template.html	Thu Jul 15 18:42:04 2010 +0300
@@ -16,7 +16,7 @@
 <title>#Title#</title>
 </head>
 
-<body>
+<body dir=#dir#>
 <table width="100%">
     <tr><td class="header"><div class="title"><a class="weburl" href="#WebUrl#">#Title#</a></div><div class="date">#Date#</div></td></tr>
     <tr><td class="description">#Description#</td></tr>