--- a/uifw/AvKon/src/AknAppUi.cpp Fri Feb 19 23:04:46 2010 +0200
+++ b/uifw/AvKon/src/AknAppUi.cpp Fri Mar 12 15:43:43 2010 +0200
@@ -88,6 +88,7 @@
#include <touchfeedback.h>
#include <aknpointereventmodifier.h>
+#include <aknitemactionmenuregister.h>
// UIDS for dialler view
const TUid KPhoneAppUid = { 0x100058B3 };
@@ -683,6 +684,8 @@
}
}
+ AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( this );
+
#ifdef AVKON_RDEBUG_INFO
RDebug::Print(_L("Entering CEikAppUi::BaseConstructL()"));
#endif
@@ -1547,20 +1550,20 @@
User::LeaveIfError( apparcSession.Connect() );
CleanupClosePushL( apparcSession );
TApaAppInfo appInfo;
- TInt err = apparcSession.GetAppInfo( appInfo, this->Application()->AppDllUid() );
-
+
// +2 for colon and line end
- HBufC* captionBuffer =
- HBufC::NewLC( KApaMaxAppCaption + KAknBidiExtraSpacePerLine + 2 );
-
-// CleanupStack::PushL( captionBuffer );
+ HBufC* captionBuffer = HBufC::NewLC(KApaMaxAppCaption + KAknBidiExtraSpacePerLine + 2);
TPtr caption = captionBuffer->Des();
- if ( err == KErrNone )
+ CEikApplication *application = this->Application();
+ if (NULL != application)
{
- caption = appInfo.iCaption;
+ if (KErrNone == apparcSession.GetAppInfo(appInfo, application->AppDllUid()))
+ {
+ caption = appInfo.iCaption;
+ }
}
-
+
// Lets remove trailing spaces
caption.TrimRight();