diff -r e45c3f40ea5f -r 4530440261a8 browserui/browser/FeedsSrc/FeedsFolderView.cpp --- a/browserui/browser/FeedsSrc/FeedsFolderView.cpp Fri Jul 03 15:46:41 2009 +0100 +++ b/browserui/browser/FeedsSrc/FeedsFolderView.cpp Thu Aug 27 07:42:55 2009 +0300 @@ -457,7 +457,7 @@ // Create Folder iApiProvider.FeedsClientUtilities().AddItemL(*aMenuPane, EFeedsNewFolder, R_OPTIONS_ORG_NEW_FOLDER); } - else if(aResourceId == R_FEEDS_OPTIONS_MARKUNMARK_SUBMENU) + else if( (aResourceId == R_FEEDS_OPTIONS_MARKUNMARK_SUBMENU) || (aResourceId == R_FEEDS_FOLDER_VIEW_MARK_UNMARK_MENU ) ) { // Mark (or unmark) if(IsCurrentItemMarked()) @@ -482,7 +482,22 @@ { - } + } + else if(aResourceId == R_FEEDS_FOLDER_MENU_PANE_CONTEXT_MENU) + { + aMenuPane->SetItemDimmed(EFeedsMoveToFolder,ETrue); + + if (!(item->GetType() == EFolder)) + { + TInt folderCount = 0; + iContainer->CountFolderFolders(iContainer->iRootFolder, folderCount); + + if(iContainer && (folderCount> 0) && !iContainer->IsMarkedItemFolder()) + { + aMenuPane->SetItemDimmed(EFeedsMoveToFolder,EFalse); + } + } + } iApiProvider.FeedsClientUtilities().DynInitMenuPaneL(aResourceId, aMenuPane ); }