diff -r 25214794fad6 -r 08ffbd51e3fd browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp --- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Tue Apr 27 16:41:18 2010 +0300 +++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Tue May 11 16:16:13 2010 +0300 @@ -1285,8 +1285,9 @@ } if ( ( item ) && ( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) || - ( item->ContextId() != NULL ) ) - ) + ( item->ContextId() != NULL ) || + (item->IsReadOnly()) ) //If the bookmarks are the default provided by operator + ) { // We can't delete adaptive bookmarks folder, // or seamless folders @@ -1297,6 +1298,7 @@ { aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue ); } + #endif // downloads aMenuPane->SetItemDimmed( EWmlCmdDownloads, !ApiProvider().BrCtlInterface().BrowserSettingL( TBrCtlDefs::ESettingsNumOfDownloads ) ); @@ -1456,9 +1458,13 @@ { aMenuPane->SetItemDimmed( EWmlCmdEditBookmark, ETrue ); } - else if ( (item && (item->IsFolder() || + else if (( (item && (item->IsFolder() || item->Uid() == KFavouritesAdaptiveItemsFolderUid || item->ContextId() || aState.CurrentIsSpecial() || iInAdaptiveBookmarksFolder))) +#ifdef BRDO_SINGLE_CLICK_ENABLED_FF + ||(item->IsReadOnly())//If the bookmarks are readonly(set by the operator) +#endif + ) { aMenuPane->SetItemDimmed( EWmlCmdEditBookmark, ETrue ); } @@ -2239,6 +2245,10 @@ container->GotoPane()->CancelEditingL(); ApiProvider().FetchL( iEnteredURL->Des(), CBrowserLoadObserver::ELoadUrlTypeOther ); + if ( !ApiProvider().Fetching() ) + { + container->SetGotoInactiveL(); + } } } }