diff -r d6fe6244b863 -r e6e3e87d58b4 launcher/src/launcherappui.cpp --- a/launcher/src/launcherappui.cpp Tue Feb 02 00:17:27 2010 +0200 +++ b/launcher/src/launcherappui.cpp Fri Mar 19 09:29:26 2010 +0200 @@ -39,9 +39,9 @@ void CLauncherAppUi::ConstructL() { BaseConstructL(EAknEnableSkin); - + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) iSendUi = CSendUi::NewL(); - + #endif // Show tabs for main views from resources CEikStatusPane* sp = StatusPane(); @@ -91,8 +91,9 @@ delete iEngine; delete iDecoratedTabGroup; - + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) delete iSendUi; + #endif } // ------------------------------------------------------------------------------ @@ -114,6 +115,7 @@ aMenuPane->SetItemDimmed(ECmdDeleteLog, !(iEngine->LogFileExists() || iEngine->BCLogFileExists())); // SendUI for the log file +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) if (iEngine->LogFileExists() || iEngine->BCLogFileExists()) { TInt index(0); @@ -121,8 +123,9 @@ iSendUi->AddSendMenuItemL(*aMenuPane, index-1, ECmdSendUILogFile, TSendingCapabilities(0, 0, TSendingCapabilities::ESupportsAttachments)); aMenuPane->SetItemTextL(ECmdSendUILogFile, _L("Send log(s)")); } +#endif } - +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) else if (aResourceId == R_LAUNCHER_DLLINFO_SUBMENU) { //SendUI for the system dll file @@ -133,6 +136,7 @@ aMenuPane->SetItemTextL(ECmdSendUISystemDllFile, _L("Send list of DLLs")); aMenuPane->SetItemButtonState(ECmdSendUISystemDllFile, EEikMenuItemSymbolIndeterminate); } +#endif } // ---------------------------------------------------- @@ -238,7 +242,7 @@ iEngine->StopLaunchingL(); break; } - +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) case ECmdSendUILogFile: { iEngine->SendLogViaSendUiL(iSendUi); @@ -250,6 +254,7 @@ iEngine->SendListOfSystemDllsViaSendUiL(iSendUi); break; } +#endif case EAknSoftkeyCancel: { iEngine->Cancel();