equal
deleted
inserted
replaced
93 { |
93 { |
94 #ifdef RD_MESSAGING_GENERAL_SETTINGS_RENOVATION |
94 #ifdef RD_MESSAGING_GENERAL_SETTINGS_RENOVATION |
95 CMceSettingsMultipleServicesDialog* mailDlg =new( ELeave ) CMceSettingsMultipleServicesDialog(aManager, aMessageType, aSession ); |
95 CMceSettingsMultipleServicesDialog* mailDlg =new( ELeave ) CMceSettingsMultipleServicesDialog(aManager, aMessageType, aSession ); |
96 CleanupStack::PushL( mailDlg ); |
96 CleanupStack::PushL( mailDlg ); |
97 FeatureManager::InitializeLibL(); |
97 FeatureManager::InitializeLibL(); |
98 if ( FeatureManager::FeatureSupported( KFeatureIdSelectableEmail ) ) |
98 TBool temp = FeatureManager::FeatureSupported( KFeatureIdSelectableEmail ); |
|
99 FeatureManager::UnInitializeLib(); |
|
100 if ( temp ) |
99 { |
101 { |
100 mailDlg->ConstructL(R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG_MENUBAR_WITH_SELECTABLE_EMAIL ); |
102 mailDlg->ConstructL(R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG_MENUBAR_WITH_SELECTABLE_EMAIL ); |
101 CleanupStack::Pop( mailDlg ); |
103 CleanupStack::Pop( mailDlg ); |
102 return mailDlg->ExecuteLD( R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG_MENUBAR_WITH_SELECTABLE_EMAIL ); |
104 return mailDlg->ExecuteLD( R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG_MENUBAR_WITH_SELECTABLE_EMAIL ); |
103 } |
105 } |
106 mailDlg->ConstructL( R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG_MENUBAR ); |
108 mailDlg->ConstructL( R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG_MENUBAR ); |
107 CleanupStack::Pop( mailDlg ); |
109 CleanupStack::Pop( mailDlg ); |
108 return mailDlg->ExecuteLD( R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG ); |
110 return mailDlg->ExecuteLD( R_MCE_SETTINGS_MULTIPLE_SERVICES_DIALOG ); |
109 |
111 |
110 } |
112 } |
111 FeatureManager::UnInitializeLib(); |
|
112 #else |
113 #else |
113 User::Leave( KErrNotSupported ); |
114 User::Leave( KErrNotSupported ); |
114 return KErrNotSupported; |
115 return KErrNotSupported; |
115 #endif // RD_MESSAGING_GENERAL_SETTINGS_RENOVATION |
116 #endif // RD_MESSAGING_GENERAL_SETTINGS_RENOVATION |
116 } |
117 } |
1067 } |
1068 } |
1068 |
1069 |
1069 const MImumInHealthServices* healthApi = |
1070 const MImumInHealthServices* healthApi = |
1070 &iEmailApi->HealthServicesL(); |
1071 &iEmailApi->HealthServicesL(); |
1071 |
1072 |
1072 TInt error; |
|
1073 iMailboxArray.Reset(); |
1073 iMailboxArray.Reset(); |
1074 if ( iMessageType == KSenduiMtmSyncMLEmailUid ) |
1074 if ( iMessageType == KSenduiMtmSyncMLEmailUid ) |
1075 { |
1075 { |
1076 error = MceSettingsUtils::GetHealthyMailboxListL( *healthApi, |
1076 MceSettingsUtils::GetHealthyMailboxListL( *healthApi, |
1077 iMailboxArray, |
1077 iMailboxArray, |
1078 EFalse, |
1078 EFalse, |
1079 EFalse, |
1079 EFalse, |
1080 ETrue,EFalse ); |
1080 ETrue,EFalse ); |
1081 } |
1081 } |
1082 else |
1082 else |
1083 { |
1083 { |
1084 error = MceSettingsUtils::GetHealthyMailboxListL( *healthApi, |
1084 MceSettingsUtils::GetHealthyMailboxListL( *healthApi, |
1085 iMailboxArray, |
1085 iMailboxArray, |
1086 ETrue, |
1086 ETrue, |
1087 ETrue, |
1087 ETrue, |
1088 EFalse,ETrue ); |
1088 EFalse,ETrue ); |
1089 } |
1089 } |
1490 // start |
1490 // start |
1491 TUid mtmType; |
1491 TUid mtmType; |
1492 TInt item = list->CurrentItemIndex(); |
1492 TInt item = list->CurrentItemIndex(); |
1493 CMsvEntry* entry = NULL; |
1493 CMsvEntry* entry = NULL; |
1494 |
1494 |
1495 TRAPD( error, entry = iSession->GetEntryL( |
1495 TRAP_IGNORE( entry = iSession->GetEntryL( |
1496 (*iAccountArray)[item-1].iUid.iUid )); |
1496 (*iAccountArray)[item-1].iUid.iUid )); |
1497 |
1497 |
1498 if ( entry ) |
1498 if ( entry ) |
1499 { |
1499 { |
1500 TMsvEntry tentry = entry->Entry(); |
1500 TMsvEntry tentry = entry->Entry(); |
1715 iMessageType == KSenduiMtmSyncMLEmailUid,ETrue ); |
1715 iMessageType == KSenduiMtmSyncMLEmailUid,ETrue ); |
1716 if ( error == KErrNone && |
1716 if ( error == KErrNone && |
1717 ( iMtmPluginId == 0 || iMessageType == KSenduiMtmSyncMLEmailUid ) ) |
1717 ( iMtmPluginId == 0 || iMessageType == KSenduiMtmSyncMLEmailUid ) ) |
1718 { |
1718 { |
1719 const TInt mailboxArrayCount = iMailboxArray.Count(); |
1719 const TInt mailboxArrayCount = iMailboxArray.Count(); |
1720 TBool foundServiceArray = EFalse; |
|
1721 TMsvId msvId; |
1720 TMsvId msvId; |
1722 |
1721 |
1723 for ( TInt cc = 0; cc < mailboxArrayCount; cc++) |
1722 for ( TInt cc = 0; cc < mailboxArrayCount; cc++) |
1724 { |
1723 { |
1725 msvId = iMailboxArray[cc]; |
1724 msvId = iMailboxArray[cc]; |