X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallPresentationModel.cpp;h=dda4b4b344e3d93bd0e0b637812f64c9bef2260f;hb=0fc070c3be46085c5d15c0b9b10a2f9e6b100ab7;hp=efea53cb4731ad04d7b3a5264a2a0e030a8d1ecd;hpb=ae4a29bb3b9f149b458351feec6e6b1beccd7f86;p=apps%2Fosp%2FCall.git

diff --git a/src/CallPresentationModel.cpp b/src/CallPresentationModel.cpp
index efea53c..dda4b4b 100644
--- a/src/CallPresentationModel.cpp
+++ b/src/CallPresentationModel.cpp
@@ -257,7 +257,7 @@ CallPresentationModel::GetConferenceCallInfoN(void)
 	return __pTelephonyMgr->GetConferenceCallInfoN();
 }
 
-void
+bool
 CallPresentationModel::SplitFromConference(SplitConfCallerCmdIds splitCallerCmdId, IListT<AppCallInfo>* pConfCallList)
 {
 	int callIndex = -1;
@@ -293,11 +293,11 @@ CallPresentationModel::SplitFromConference(SplitConfCallerCmdIds splitCallerCmdI
 	//split single call from conference
 	r = __pTelephonyMgr->SplitFromConference(callToBeSpli.GetCallHandle()->ToLong());
 	TryCatch(r == E_SUCCESS,,"Split from conf. call failed");
-	return;
+	return true;
 
 CATCH:
 	__pTelEventListener->HandleTelephonyError(ERROR_SPLIT_FROM_CONFERENCE_FAILED);
-	return;
+	return false;
 }
 
 void
@@ -584,13 +584,14 @@ CallPresentationModel::HandleCallDisconnected(bool isLastCall, Tizen::Base::Coll
 			__pSettingsPresentor->SetCallState(CALL_STATE_CALL_VOICE_ACTIVE);
 		}
 	}
-	//Defer from sending call disconnected event to form, in case Msg AppControl is running,
+	//1) Defer from sending call disconnected event to form, in case Msg AppControl is running,
 	//to avoid PhoneApp from going to EndCall form, where it shows for 3 sec. and automatically closes.
-	if (__pTelEventListener != null && __isMessageAppControlRunning == false)
+	//2) Do not send call disconnected event to any form, in case an incoming call or dialing call is present.
+	if (__pTelEventListener != null && __isMessageAppControlRunning == false
+			&& __pTelephonyMgr->IsIncomingorDialingCallPresent() == false)
 	{
 		__pTelEventListener->HandleCallDisconnected(isLastCall, pCallList);
 	}
-
 }
 
 void
@@ -620,7 +621,8 @@ CallPresentationModel::HandleCallSwapOccured(Tizen::Base::Collection::IListT<App
 void
 CallPresentationModel::HandleConferenceChange(void)
 {
-	if (__pTelEventListener != null)
+	//1) Do not send conf. call changed event to any form, in case an incoming call or dialing call is present.
+	if (__pTelEventListener != null && __pTelephonyMgr->IsIncomingorDialingCallPresent() == false)
 	{
 		__pTelEventListener->HandleConferenceChange();
 	}
@@ -635,7 +637,6 @@ CallPresentationModel::HandleTelephonyError(int errorCode)
 	}
 }
 
-
 result
 CallPresentationModel::LaunchDialAppControl()
 {