--- a/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileiconutility.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileiconutility.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -27,8 +27,8 @@
#include "cimcvappbitmapmapping.h" // defines the skinned bitmap ids
#include "mimcvappui.h"
-#include <UniUtils.rsg>
-#include <MsgEditorAppUi.rsg>
+#include <uniutils.rsg>
+#include <msgeditorappui.rsg>
#include <imcvuiapp.rsg>
#include <bautils.h>
#include <PUAcodes.hrh>
--- a/imstutils/imconversationview/imcvuiapp/src/cimcvappview.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappview.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -1458,7 +1458,12 @@
case EChatAllItemDeleted:
{
IM_CV_LOGS (TXT("CIMCVAPPVIEW :: DELETE ALL CHATS ***************************"));
- iRTContainerCache->DeleteAllServiceContainer( aServiceId );
+
+ if(iViewDeactivated)
+ {
+ iRTContainerCache->DeleteAllServiceContainer( aServiceId );
+ }
+
break;
}
default:
--- a/imstutils/imconversationview/imcvuiengine/inc/cimcvenginecchhandler.h Mon Jun 21 15:25:20 2010 +0300
+++ b/imstutils/imconversationview/imcvuiengine/inc/cimcvenginecchhandler.h Thu Aug 19 09:41:53 2010 +0300
@@ -167,6 +167,8 @@
//doesnt own
MIMCVEngineCCHObserver* iObserver;
+
+ TInt iPrevNwError;
};
--- a/imstutils/imconversationview/imcvuiengine/src/cimcvenginecchhandler.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/imstutils/imconversationview/imcvuiengine/src/cimcvenginecchhandler.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -61,7 +61,8 @@
{
service->SetObserver( *this );
}
- }
+ }
+ iPrevNwError = 0;
}
@@ -280,7 +281,8 @@
{
IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL ") );
-
+ IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL:TCCHSubserviceType=%d"),aType);
+ IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL:aServiceStatus.Error()=%d"),aServiceStatus.Error());
if (aType == ECCHPresenceSub)
{
/* SIP Adaptation -- sends error in Network Lost. This is added so that once we get it, we will unbindL and delete the context
@@ -305,20 +307,25 @@
}
case ECCHDisabled:
{
- IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL DISABLED"));
- iEngine.CloseAllOpenChatsL ();
+ IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL DISABLED"));
+ if(iPrevNwError != KCCHErrorNetworkLost)
+ {
+ iEngine.CloseAllOpenChatsL ();
+ }
iEngine.ReleaseConnectionL();
iEngine.DeleteContextL ();
-
break;
}
case ECCHConnecting:
{
+ IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL ECCHConnecting") );
+ iPrevNwError = aServiceStatus.Error();
notifyEvent = MIMCVEngineCCHObserver::EConnecting;
break;
}
case ECCHEnabled:
{
+ IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL ECCHEnabled") );
notifyEvent = MIMCVEngineCCHObserver::ELogin;
iEngine.CreateContextL();
break;
@@ -327,13 +334,14 @@
{
// If NetworkErrorLost error is received by CCH on this state, then do not close all chats
// as user would loose all the on-going conversation when the network connection is
- // restored.
- if (aServiceStatus.Error () != KCCHErrorNetworkLost )
- {
- iEngine.CloseAllOpenChatsL();
- iEngine.ReleaseConnectionL ();
- iEngine.DeleteContextL ();
- }
+ // restored.
+ IM_CV_LOGS(TXT("CVEngineCCHHnadler::DoHandleServiceStatusChangedL ECCHDisconnecting") );
+// if (aServiceStatus.Error () != KCCHErrorNetworkLost )
+// {
+// iEngine.CloseAllOpenChatsL();
+// iEngine.ReleaseConnectionL ();
+// iEngine.DeleteContextL ();
+// }
notifyEvent = MIMCVEngineCCHObserver::EDisconnecting;
break;
}
--- a/imstutils/imconversationview/imcvuiengine/src/cimcvenginechatcontainer.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/imstutils/imconversationview/imcvuiengine/src/cimcvenginechatcontainer.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -152,7 +152,7 @@
IM_CV_LOGS(TXT("CIMCVEngineChatContainer::CloseAllContainers() closing container ") );
iChatListObservers[ a ]->HandleChatListEvent( iServiceId, EChatAllItemDeleted, NULL );
}
- iChatContainer.ResetAndDestroy();
+ //iChatContainer.ResetAndDestroy();
IM_CV_LOGS(TXT("CIMCVEngineChatContainer::CloseAllContainers() End") );
}
--- a/imstutils/xmppadapter/data/wpgeneralxmppsettingsadapter.rss Mon Jun 21 15:25:20 2010 +0300
+++ b/imstutils/xmppadapter/data/wpgeneralxmppsettingsadapter.rss Thu Aug 19 09:41:53 2010 +0300
@@ -27,7 +27,7 @@
#include <eikon.rh>
#include <avkon.rh>
-#include <EIKCORE.rsg>
+#include <eikcore.rsg>
#include <eikon.rsg>
#include <avkon.hrh>
#include <avkon.rsg>
--- a/instantmessagesalert/tsrc/testinstantmsgalert/ReadMe.txt Mon Jun 21 15:25:20 2010 +0300
+++ b/instantmessagesalert/tsrc/testinstantmsgalert/ReadMe.txt Thu Aug 19 09:41:53 2010 +0300
@@ -1,3 +1,20 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: ReadMe.txt
+#
+#
+
This Test Code is written in Stiff ( Test Scripter)
Stubs folder is reused from - MeCo_Domain/conversations/uiservicetab/Internal/tsrc/vimpstengine_ut/src/
Total Number of Test Cases - 17
--- a/instantmessagesalert/tsrc/testinstantmsgalert/group/ctcerr.txt Mon Jun 21 15:25:20 2010 +0300
+++ b/instantmessagesalert/tsrc/testinstantmsgalert/group/ctcerr.txt Thu Aug 19 09:41:53 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: ctcerr.txt
+#
+#
*******************************************************************************
--- a/servicewidget/servicewidgetdatapublisher/rss/servicewidgetpluginres.rss Mon Jun 21 15:25:20 2010 +0300
+++ b/servicewidget/servicewidgetdatapublisher/rss/servicewidgetpluginres.rss Thu Aug 19 09:41:53 2010 +0300
@@ -20,7 +20,7 @@
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.mbg>
-#include <EIKCORE.rsg>
+#include <eikcore.rsg>
#include <eikon.rsg>
#include <meco.loc>
--- a/uiservicetab/Group/bld.inf Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/Group/bld.inf Thu Aug 19 09:41:53 2010 +0300
@@ -34,7 +34,10 @@
../inc/servicetabmenucommandinfo.hrh APP_LAYER_PLATFORM_EXPORT_PATH( servicetabmenucommandinfo.hrh)
// ROM SIS stubs
../sis/uiservicetabstub.sis /epoc32/data/Z/System/Install/uiservicetabstub.sis
-backup_registration.xml z:/private/20012423/backup_registration.xml
+// Backup registration files
+backup_registration.xml /epoc32/data/z/private/20012423/backup_registration.xml
+backup_registration.xml /epoc32/release/winscw/udeb/z/private/20012423/backup_registration.xml
+backup_registration.xml /epoc32/release/winscw/urel/z/private/20012423/backup_registration.xml
// MMP files for project components
PRJ_MMPFILES
--- a/uiservicetab/rom/imuiservicetab.iby Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/rom/imuiservicetab.iby Thu Aug 19 09:41:53 2010 +0300
@@ -36,6 +36,8 @@
// stub SIS, provides support for SIS upgrading
data=DATAZ_/system/install/uiservicetabstub.sis system/install/uiservicetabstub.sis
+data=DATAZ_\private\20012423\backup_registration.xml private\20012423\backup_registration.xml
+
#endif //__IMUISERVICETAB_IBY__
--- a/uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/data/ReadMe.txt Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/data/ReadMe.txt Thu Aug 19 09:41:53 2010 +0300
@@ -1,3 +1,20 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: ReadMe.txt
+#
+#
+
This Test Code is written in Stiff ( Unit)
Total Number of Test Cases - 65
Branch Coverage - 56
--- a/uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/data/TestReport.txt Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstcmdprocess/tsrc/vimpstcmdprocess_utest/data/TestReport.txt Thu Aug 19 09:41:53 2010 +0300
@@ -1,3 +1,20 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: TestReport.txt
+#
+#
+
***************************************************************************
Tuesday 06th October 2009
4:25:11 pm
--- a/uiservicetab/vimpstdetailsviewplugin/data/vimpstdetailsviewpluginrsc.rss Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstdetailsviewplugin/data/vimpstdetailsviewpluginrsc.rss Thu Aug 19 09:41:53 2010 +0300
@@ -26,7 +26,7 @@
#include <eikon.rh>
#include <avkon.rh>
-#include <EIKCORE.rsg>
+#include <eikcore.rsg>
#include <eikon.rsg>
#include <avkon.hrh>
#include <avkon.rsg>
--- a/uiservicetab/vimpstdetailsviewplugin/src/cvimpstdetailspresencehandler.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstdetailsviewplugin/src/cvimpstdetailspresencehandler.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -108,6 +108,7 @@
iUserId = NULL;
}
iUserId = aUserId.AllocL();
+ iStatus = TVIMPSTEnums::EOffline;
if( !iPresenceSupported )
{
return;
@@ -401,7 +402,7 @@
{
iStatusText = StringLoader::LoadL( resourceId );
}
- if( iStatusText && iUserId )
+ if( iStatusText )
{
return *iStatusText;
}
--- a/uiservicetab/vimpstui/inc/cvimpstuidoublelistboxtabviewcontrol.h Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/inc/cvimpstuidoublelistboxtabviewcontrol.h Thu Aug 19 09:41:53 2010 +0300
@@ -51,7 +51,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine );
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba);
/**
* Creates a new CImContactsTabbedViewControl and leaves it to
@@ -69,7 +70,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine );
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba);
/**
* Destructor.
@@ -254,7 +256,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine );
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba);
/**
* Performs the 2nd phase of construction.
--- a/uiservicetab/vimpstui/inc/cvimpstuisinglelistboxtabviewcontrol.h Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/inc/cvimpstuisinglelistboxtabviewcontrol.h Thu Aug 19 09:41:53 2010 +0300
@@ -50,7 +50,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine );
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba);
/**
* Creates a new CImContactsTabbedViewControl and leaves it to
@@ -68,7 +69,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine );
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba);
/**
* Destructor.
@@ -254,7 +256,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine );
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba);
/**
* Performs the 2nd phase of construction.
--- a/uiservicetab/vimpstui/inc/mvimpstuitabcontrolfactory.h Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/inc/mvimpstuitabcontrolfactory.h Thu Aug 19 09:41:53 2010 +0300
@@ -47,7 +47,8 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine )
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
{
// LOGIC : IF presence is enabled for that service then
@@ -60,7 +61,8 @@
aCommandHandler,
aServiceId,
aBrandHandler ,
- aEngine );
+ aEngine,
+ aCba);
}
else
@@ -70,7 +72,8 @@
aCommandHandler,
aServiceId,
aBrandHandler ,
- aEngine );
+ aEngine,
+ aCba);
}
}
--- a/uiservicetab/vimpstui/src/cvimpstuiblockview.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/src/cvimpstuiblockview.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -39,7 +39,7 @@
#include <AiwCommon.hrh>
//resource
#include <vimpstuires.rsg>
-#include <ExtensionManagerRes.rsg>
+#include <extensionmanagerres.rsg>
#include "uiservicetabtracer.h"
using namespace Phonebook2;
--- a/uiservicetab/vimpstui/src/cvimpstuidoublelistboxtabviewcontrol.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/src/cvimpstuidoublelistboxtabviewcontrol.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -67,14 +67,16 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine )
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
:iTabbedView(aTabbedView),
iKeyEventHandler(aKeyEventHandler),
iCommandHandler(aCommandHandler),
iArrayProcess(iCommandHandler.GetProcessInterface()),
iServiceId(aServiceId),
iBrandHandler(aBrandHandler),
- iEngine(aEngine)
+ iEngine(aEngine),
+ iCba(aCba)
{
}
@@ -144,11 +146,12 @@
(CVIMPSTUiTabbedView& aTabbedView,MPbk2KeyEventHandler* aKeyEventHandler,
MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine)
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
{
TRACER_AUTO;
CVIMPSTUiDoubleListBoxTabViewControl* self = NewLC(aTabbedView,aKeyEventHandler,
- aCommandHandler, aServiceId, aBrandHandler,aEngine);
+ aCommandHandler, aServiceId, aBrandHandler,aEngine,aCba);
CleanupStack::Pop(self);
return self;
}
@@ -162,12 +165,13 @@
(CVIMPSTUiTabbedView& aTabbedView,MPbk2KeyEventHandler* aKeyEventHandler,
MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine)
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
{
TRACER_AUTO;
CVIMPSTUiDoubleListBoxTabViewControl* self =
new (ELeave) CVIMPSTUiDoubleListBoxTabViewControl(aTabbedView,aKeyEventHandler,
- aCommandHandler, aServiceId, aBrandHandler,aEngine);
+ aCommandHandler, aServiceId, aBrandHandler,aEngine,aCba);
CleanupStack::PushL(self);
self->ConstructL();
return self;
@@ -1232,10 +1236,10 @@
TVIMPSTEnums::TOnlineStatus onlinestatus = iCommandHandler.GetProcessInterface().GetOnlineStatusL(index);
TVIMPSTEnums::TVIMPSTRegistrationState servicestate = iEngine.ServiceState();
TBool updateinvalid( iLastFocusedItemType == TVIMPSTEnums::EInvalid );
- if ( !iCba )
- {
- iCba = CEikButtonGroupContainer::Current();
- }
+// if ( !iCba )
+// {
+// iCba = CEikButtonGroupContainer::Current();
+// }
// default softkeys
if(iCba)
--- a/uiservicetab/vimpstui/src/cvimpstuisearchview.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/src/cvimpstuisearchview.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -64,7 +64,7 @@
#include "MxSPContactManager.h"
//resource
-#include <ExtensionManagerRes.rsg>
+#include <extensionmanagerres.rsg>
#include <vimpstuires.rsg>
// System includes
--- a/uiservicetab/vimpstui/src/cvimpstuisinglelistboxtabviewcontrol.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/src/cvimpstuisinglelistboxtabviewcontrol.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -75,14 +75,16 @@
MVIMPSTCmdHandler& aCommandHandler,
TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine )
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
:iTabbedView(aTabbedView),
iKeyEventHandler(aKeyEventHandler),
iCommandHandler(aCommandHandler),
iArrayProcess(iCommandHandler.GetProcessInterface()),
iServiceId(aServiceId),
iBrandHandler(aBrandHandler),
- iEngine(aEngine)
+ iEngine(aEngine),
+ iCba(aCba)
{
}
@@ -154,11 +156,12 @@
(CVIMPSTUiTabbedView& aTabbedView,MPbk2KeyEventHandler* aKeyEventHandler,
MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine)
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
{
TRACER_AUTO;
CVIMPSTUiSingleListBoxTabViewControl* self = NewLC(aTabbedView,aKeyEventHandler,
- aCommandHandler, aServiceId, aBrandHandler,aEngine);
+ aCommandHandler, aServiceId, aBrandHandler,aEngine,aCba);
CleanupStack::Pop(self);
return self;
}
@@ -172,12 +175,13 @@
(CVIMPSTUiTabbedView& aTabbedView,MPbk2KeyEventHandler* aKeyEventHandler,
MVIMPSTCmdHandler& aCommandHandler, TUint32 aServiceId,
CVIMPSTUiBrandData& aBrandHandler,
- MVIMPSTEngine& aEngine)
+ MVIMPSTEngine& aEngine,
+ CEikButtonGroupContainer* aCba)
{
TRACER_AUTO;
CVIMPSTUiSingleListBoxTabViewControl* self =
new (ELeave) CVIMPSTUiSingleListBoxTabViewControl(aTabbedView,aKeyEventHandler,
- aCommandHandler, aServiceId, aBrandHandler,aEngine);
+ aCommandHandler, aServiceId, aBrandHandler,aEngine,aCba);
CleanupStack::PushL(self);
self->ConstructL();
return self;
@@ -1026,10 +1030,10 @@
TVIMPSTEnums::TItem itemtype = iArrayProcess.GetType(index);
TVIMPSTEnums::TVIMPSTRegistrationState servicestate = iEngine.ServiceState();
TBool updateinvalid( iLastFocusedItemType == TVIMPSTEnums::EInvalid );
- if ( !iCba )
- {
- iCba = CEikButtonGroupContainer::Current();
- }
+// if ( !iCba )
+// {
+// iCba = CEikButtonGroupContainer::Current();
+// }
// default softkeys
if( aUseDefaultCba || updateinvalid )
--- a/uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -83,7 +83,7 @@
#include "cvimpstuimenuextension.h"
//resource
-#include <ExtensionManagerRes.rsg>
+#include <extensionmanagerres.rsg>
#include <vimpstuires.rsg>
//CCA
@@ -1090,7 +1090,7 @@
iContainerCreationStarted = ETrue;
iContainer = MVIMPSTUiTabbedViewControlFactory::NewTabControlL(*this,
&iView,iCommandHandler, iServiceId,
- *iBrandHandler, iEngine);
+ *iBrandHandler, iEngine, iView.Cba());
// take the control pointer
CCoeControl* cCoeControl = iContainer->CoeControl();
iAppUi->AddToStackL( iView, cCoeControl );
--- a/uiservicetab/vimpstui/src/cvimpstuitermsofusedlg.cpp Mon Jun 21 15:25:20 2010 +0300
+++ b/uiservicetab/vimpstui/src/cvimpstuitermsofusedlg.cpp Thu Aug 19 09:41:53 2010 +0300
@@ -42,7 +42,7 @@
#include <vimpstuires.rsg>
// item finder (Automatic highlight)
-#include <FindItemmenu.rsg>
+#include <finditemmenu.rsg>
#include <finditemmenu.h>
#include <finditem.hrh>
#include <finditemdialog.h>