FCL/sf/mw/classicui: comparison uifw/AvKon/src/AknAppUi.cpp

equal deleted inserted replaced

-:8ca85d2f0db7
+:aabf2c525e0f
 #include <touchfeedbackadaptation.h>
 #include <touchfeedback.h>
 #include <aknpointereventmodifier.h>
+#include <aknitemactionmenuregister.h>
 // UIDS for dialler view
 const TUid KPhoneAppUid = { 0x100058B3 };
 const TUid KAknDiallerViewUid = {0x10282D81};
 const TUid KDiallerVievCommand = {0x1};
 {
 iAknFlags.Set( ETouchCompatible );
 }
 }
+AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( this );
 #ifdef AVKON_RDEBUG_INFO
 RDebug::Print(_L("Entering CEikAppUi::BaseConstructL()"));
 #endif
 // Touch compatibility mode. Change application screen mode before
 // Solving the application name asing AppArc.lib
 RApaLsSession apparcSession;
 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);
+TPtr caption = captionBuffer->Des();
+CEikApplication *application = this->Application();
+if (NULL != application)
+{
+if (KErrNone == apparcSession.GetAppInfo(appInfo, application->AppDllUid()))
+{
+caption = appInfo.iCaption;
+}
+}
-// +2 for colon and line end
-HBufC* captionBuffer =
-HBufC::NewLC( KApaMaxAppCaption + KAknBidiExtraSpacePerLine + 2 );
-//        CleanupStack::PushL( captionBuffer );
-TPtr caption = captionBuffer->Des();
-if ( err == KErrNone )
-{
-caption = appInfo.iCaption;
-}
 // Lets remove trailing spaces
 caption.TrimRight();
 // Insert the application name into the beginning of the error string
 if ( caption.Length() != 0 )

branch	RCL_3
changeset 9	aabf2c525e0f
parent 0	2f259fa3e83a
child 10	9f56a4e1b8ab