equal
deleted
inserted
replaced
42 #include <settingsinternalcrkeys.h> |
42 #include <settingsinternalcrkeys.h> |
43 #include <SpeeddialPrivateCRKeys.h> |
43 #include <SpeeddialPrivateCRKeys.h> |
44 |
44 |
45 |
45 |
46 #include <StringLoader.h> |
46 #include <StringLoader.h> |
47 #include <SpdCtrl.rsg> |
47 #include <spdctrl.rsg> |
48 #include <spdctrl.mbg> |
48 #include <spdctrl.mbg> |
49 #include <avkon.mbg> |
49 #include <avkon.mbg> |
50 #include <gdi.h> |
50 #include <gdi.h> |
51 #include <AknIconArray.h> |
51 #include <AknIconArray.h> |
52 |
52 |
95 #include <voicemailboxdomaincrkeys.h> |
95 #include <voicemailboxdomaincrkeys.h> |
96 #include <AiwGenericParam.h> |
96 #include <AiwGenericParam.h> |
97 #include <AiwServiceHandler.h> |
97 #include <AiwServiceHandler.h> |
98 #include <telvmbxsettingscrkeys.h> |
98 #include <telvmbxsettingscrkeys.h> |
99 |
99 |
100 #include <VPbkEng.rsg> |
100 #include <vpbkeng.rsg> |
101 #include <AiwContactAssignDataTypes.h> |
101 #include <AiwContactAssignDataTypes.h> |
102 |
102 |
103 #include "SpdiaContainer.h" |
103 #include "SpdiaContainer.h" |
104 #include <MPbk2FieldPropertyArray2.h> |
104 #include <MPbk2FieldPropertyArray2.h> |
105 #include <MPbk2FieldProperty2.h> |
105 #include <MPbk2FieldProperty2.h> |
221 iVideoMail(0), |
221 iVideoMail(0), |
222 iMail(NULL), |
222 iMail(NULL), |
223 iFetchmail(EFalse), |
223 iFetchmail(EFalse), |
224 iServiceHandler(NULL), |
224 iServiceHandler(NULL), |
225 iCancelFlag(0), |
225 iCancelFlag(0), |
226 iRemoveConfirmQueryDialog( NULL ) |
226 iRemoveConfirmQueryDialog( NULL ), |
|
227 iFindOperation( NULL ) |
227 /*iOperationComplete(EFalse),*/ |
228 /*iOperationComplete(EFalse),*/ |
228 { |
229 { |
229 |
230 |
230 } |
231 } |
231 |
232 |
493 { |
494 { |
494 delete iRemoveConfirmQueryDialog; |
495 delete iRemoveConfirmQueryDialog; |
495 iRemoveConfirmQueryDialog = NULL; |
496 iRemoveConfirmQueryDialog = NULL; |
496 } |
497 } |
497 |
498 |
498 ixspIconInfoArray.Close(); |
499 ixspIconInfoArray.Close(); |
|
500 |
|
501 // Make sure iFindOperation released if it has not release in InitIndexDataL() |
|
502 delete iFindOperation; |
499 } |
503 } |
500 |
504 |
501 // --------------------------------------------------------- |
505 // --------------------------------------------------------- |
502 // CSpeedDialPrivate::InitializeArray |
506 // CSpeedDialPrivate::InitializeArray |
503 // |
507 // |
2693 } |
2697 } |
2694 //Fetch all contacts for which speed dial attribute is set. |
2698 //Fetch all contacts for which speed dial attribute is set. |
2695 iFetchAll = EFalse; |
2699 iFetchAll = EFalse; |
2696 iSpeedDial->SetIndex(CVPbkSpeedDialAttribute::KSpeedDialIndexNotDefined); |
2700 iSpeedDial->SetIndex(CVPbkSpeedDialAttribute::KSpeedDialIndexNotDefined); |
2697 // iSpeedDial->SetIndex(2); |
2701 // iSpeedDial->SetIndex(2); |
2698 MVPbkContactOperationBase* findOperation = iAttributeManager->ListContactsL(*iSpeedDial,(*this)); |
2702 iFindOperation = iAttributeManager->ListContactsL( *iSpeedDial , ( *this ) ); |
2699 |
2703 |
2700 while(findOperation != NULL && !iFetchAll) |
2704 while( iFindOperation != NULL && !iFetchAll ) |
2701 { |
2705 { |
2702 //Wait till every contactlink is fetched and set. |
2706 //Wait till every contactlink is fetched and set. |
2703 Wait(); |
2707 Wait(); |
2704 } |
2708 } |
2705 //Delete the handle |
2709 //Delete the handle |
2706 delete findOperation; |
2710 delete iFindOperation; |
|
2711 iFindOperation = NULL; |
2707 |
2712 |
2708 MVPbkContactOperationBase* retrieveOperation = NULL; |
2713 MVPbkContactOperationBase* retrieveOperation = NULL; |
2709 for(TInt count =0; iContactLinkArray && count < iContactLinkArray->Count();++count) |
2714 for(TInt count =0; iContactLinkArray && count < iContactLinkArray->Count();++count) |
2710 { |
2715 { |
2711 iRetrieveComplete = EFalse; |
2716 iRetrieveComplete = EFalse; |