--- a/phoneapp/phoneuiview/src/cphonebubblewrapper.cpp Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneapp/phoneuiview/src/cphonebubblewrapper.cpp Wed Oct 13 14:31:22 2010 +0300
@@ -55,7 +55,6 @@
#include "mphonenumberentry.h"
#include "cphonenumberentry.h"
#include "phonebubbleextensionmanager.h"
-#include "phonevanitydialingutils.h"
#include "mphonecustomization.h"
@@ -554,14 +553,6 @@
aCallHeaderParam->CNAPText(),
aCallHeaderParam->CNAPTextClippingDirection() );
- // Set CLI type to be used in conference call participant list
- CBubbleManager::TBubbleParticipantListCLI partipantCli =
- ( aCallHeaderParam->ParticipantCLI() ==
- TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText ) ?
- CBubbleManager::EParticipantListCNAP :
- CBubbleManager::EParticipantListCLIText;
- iBubbleManager->SetParticipantListCLI( aBubble, partipantCli );
-
iBubbleManager->SetCallFlags( aBubble, aCallHeaderParam->CallFlag() );
// Set ciphering indicator
@@ -662,18 +653,13 @@
AknTextUtils::ConvertDigitsTo( *entryContent->String(), EDigitTypeWestern );
- if ( FeatureManager::FeatureSupported( KFeatureIdFfHomeScreenVanityDialing ) )
- {
- PhoneVanityDialingUtils::DoVanityNumberConversion( *entryContent->String() );
- }
-
__PHONELOG1( EBasic, EPhoneUIView,
"CPhoneBubbleWrapper::GetNumberEntryContent(%S)",
entryContent->String() );
}
// -----------------------------------------------------------------------------
-// CPhoneBubbleWrapper.::GetLocalizedNumberEntryContent
+// CPhoneBubbleWrapper.::GetNumberEntryContent
// -----------------------------------------------------------------------------
//
void CPhoneBubbleWrapper::GetLocalizedNumberEntryContent(
@@ -706,6 +692,7 @@
if ( iUseDialer )
{
iDialerNumberEntry->CreateNumberEntry();
+ iDialerNumberEntry->GetNumberEntry()->SetFocus( ETrue );
}
else
{
@@ -1394,9 +1381,9 @@
RemoveConferenceL();
}
- iBubbleManager->RemoveCallHeader( bubble );
- iMapping->RemoveFromMapping( aCallId );
- iBubbleManager->EndChanges();
+ iBubbleManager->RemoveCallHeader( bubble );
+ iMapping->RemoveFromMapping( aCallId );
+ iBubbleManager->EndChanges();
}
}