X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCallActiveCallForm.cpp;h=df2a4f3ed30794fc88b6f29d3f1d9b06787cf1df;hb=ae4a29bb3b9f149b458351feec6e6b1beccd7f86;hp=11ef10b7672f1d69553aec35a384dce3f14ac14d;hpb=41c8c6ea37bd4bb51cbec4c74ce0481e5e10b993;p=apps%2Fosp%2FCall.git

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index 11ef10b..df2a4f3 100644
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -194,8 +194,6 @@ ActiveCallForm::OnInitializing(void)
 void
 ActiveCallForm::ShowDTMFKeypad(void)
 {
-
-
 	if(__pDTMFKeypad == null)
 	{
 		//update rect according to client screen area
@@ -1138,7 +1136,7 @@ ActiveCallForm::HandleConfCallChanged(void)
 	//change AddCall Button status
 	__pCallButtonsPanel->EnableAddCallButton(isEnableAddCall);
 	//change JoinCall Button status
-	__pCallButtonsPanel->EnableJoinCallButton(isEnableJoinCall);
+	__pCallButtonsPanel->EnableJoinCallButton(__pCallPresentor->IsEnableJoinCallButton());
 	AppLog("EXIT");
 }
 
@@ -1290,15 +1288,7 @@ ActiveCallForm::UpdateMultipleCallScreen(Tizen::Base::Collection::IListT<AppCall
 	}
 
 	//update JoinCall button status
-	bool isEnableJoinCall = true;
-	AppCallInfo* pConfCallInfo = __pCallPresentor->GetConferenceCallInfoN();
-	if(pConfCallInfo != null && pConfCallInfo->GetCallerListCount() >= IDI_MAX_CONF_CALL_PARTICIPANTS)
-	{
-		isEnableJoinCall = false;
-	}
-	__pCallButtonsPanel->EnableJoinCallButton(isEnableJoinCall);
-	delete pConfCallInfo;
-	pConfCallInfo = null;
+	__pCallButtonsPanel->EnableJoinCallButton(__pCallPresentor->IsEnableJoinCallButton());
 	Invalidate(true);
 	AppLog("EXIT");
 }