--- a/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp Wed Jun 09 09:41:11 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp Mon Jun 21 15:39:45 2010 +0300
@@ -226,14 +226,23 @@
//
void TPhoneCallHeaderParam::SetBasicCallHeaderParamsL(
const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
+ TPhoneCmdParamCallHeaderData* aCallHeaderData,
+ TBool aInitializing )
{
__LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetBasicCallHeaderParamsL( ) ");
// Set call header call state
- aCallHeaderData->SetCallState(
- iStateMachine.PhoneEngineInfo()->CallState( aCallId ) );
-
- // Set call header type
+ if( aInitializing )
+ {
+ // fake state to initializing call this way we get correct bubble to screen.
+ aCallHeaderData->SetCallState( EPEStateDialing );
+ }
+ else
+ {
+ aCallHeaderData->SetCallState(
+ iStateMachine.PhoneEngineInfo()->CallState( aCallId ) );
+ }
+
+ // Set call header type.
aCallHeaderData->SetCallType( GetCallType( aCallId, aCallHeaderData ) );
aCallHeaderData->SetCallFlag( CallHeaderType() );
@@ -527,7 +536,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetIncomingCallHeaderParamsL( ) ");
// Set basic params must be called before update is called.
- SetBasicCallHeaderParamsL( aCallId, aCallHeaderData );
+ SetBasicCallHeaderParamsL( aCallId, aCallHeaderData, EFalse );
// Set call header labels
SetCallHeaderTexts(
@@ -552,9 +561,34 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetOutgoingCallHeaderParamsL( ) ");
// Set basic params must be called before update is called.
- SetBasicCallHeaderParamsL( aCallId, aCallHeaderData );
-
+ SetBasicCallHeaderParamsL( aCallId, aCallHeaderData, EFalse );
// Set call header labels
+ SetCallHeaderLabels( aCallHeaderData );
+ SetCliParamatersL( aCallId, aCallHeaderData );
+ }
+
+// ---------------------------------------------------------------------------
+// TPhoneCallHeaderParam::SetIniticalizingCallHeaderParamsL
+// ---------------------------------------------------------------------------
+//
+void TPhoneCallHeaderParam::SetIniticalizingCallHeaderParamsL(
+ const TInt aCallId,
+ TPhoneCmdParamCallHeaderData* aCallHeaderData )
+ {
+ __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetIniticalizingCallHeaderParamsL( ) ");
+ // Set basic params must be called before update is called.
+ SetBasicCallHeaderParamsL( aCallId, aCallHeaderData, ETrue );
+ // Set call header labels
+ SetCallHeaderLabels( aCallHeaderData );
+ }
+
+// ---------------------------------------------------------------------------
+// TPhoneCallHeaderParam::SetCallHeaderLabels
+// ---------------------------------------------------------------------------
+//
+void TPhoneCallHeaderParam::SetCallHeaderLabels(
+ TPhoneCmdParamCallHeaderData* aCallHeaderData )
+ {
if ( aCallHeaderData->CallType() == EPECallTypeVideo )
{
iManagerUtility.LoadCallHeaderTexts(
@@ -569,8 +603,6 @@
EPhoneOutgoingCallLabelShort,
aCallHeaderData );
}
-
- SetCliParamatersL( aCallId, aCallHeaderData );
}
// ---------------------------------------------------------------------------