Prevent issue fix. 2Nabi issues fixed

[apps/osp/Call.git] / src / CallConfCallerListForm.cpp

diff --git a/src/CallConfCallerListForm.cpp b/src/CallConfCallerListForm.cpp
index d3735ba..6dd9a1c 100644 (file)
--- a/src/CallConfCallerListForm.cpp
+++ b/src/CallConfCallerListForm.cpp
@@ -134,6 +134,8 @@ ConfCallerListForm::OnInitializing(void)
                SetFormBackEventListener(this);
                pFooter->SetBackButton();
        }
+       Label* pTimerLbl = static_cast<Label*>(GetControl(IDC_CALL_TIME_LABEL));
+       SetControlAlwaysOnTop(*pTimerLbl,true);
 
        CreateTableView();
        __pCallPresentor = CallPresentationModel::GetInstance();
@@ -308,7 +310,7 @@ ConfCallerListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Scen
        //set itself as listener
        __pCallPresentor->SetTelEventListener(this);
 
-       AddOrientationEventListener(*this);
+       AppLogDebug("Enter");
 
        //DisableAllControls();
        if (__pConfCallInfo != null)
@@ -319,6 +321,7 @@ ConfCallerListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Scen
        //show 1st caller's info.
        //Fetch Conference call info from telephony manager
        __pConfCallInfo = __pCallPresentor->GetConferenceCallInfoN();
+       AppLogDebug("Enter %x",__pConfCallInfo);
 
        //show active call timer
        ShowTimerInfo(IDC_CALL_TIME_LABEL, __pConfCallInfo->GetCallConnectTime());
@@ -341,6 +344,7 @@ ConfCallerListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Scen
        }
 
        __pList->UpdateTableView();
+       AddOrientationEventListener(*this);
        //ActivatePanels();
 }
 
@@ -348,11 +352,6 @@ void
 ConfCallerListForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& nextSceneId)
 {
        RemoveOrientationEventListener(*this);
-       if (__pConfCallInfo != null)
-       {
-               delete __pConfCallInfo;
-               __pConfCallInfo = null;
-       }
        if (__pConfCallTimer != null)
        {
                __pConfCallTimer->Cancel();
@@ -411,6 +410,7 @@ ConfCallerListForm::SetHoldButtonStatus(bool isCallOnHold)
 void
 ConfCallerListForm::HandleParticipantsChanged(void)
 {
+       AppLogDebug("Enter");
        AppCallInfo* pCallInfo = __pCallPresentor->GetConferenceCallInfoN();
        if (pCallInfo == null)
        {
@@ -877,6 +877,7 @@ ConfCallerListForm::GetItemCount(void)
 TableViewItem*
 ConfCallerListForm::CreateItem(int itemIndex, int itemWidth)
 {
+       AppLogDebug("%d %x",itemWidth,__pConfCallInfo);
        IListT<AppCallInfo>* pCallList = __pConfCallInfo->GetCallerList();
 
        TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL;
@@ -951,6 +952,11 @@ ConfCallerListForm::CreateItem(int itemIndex, int itemWidth)
        pItem->AddControl(*pSplitCallButton);
        pItem->AddControl(*pCallLabel);
        pItem->AddControl(*pEndCallButton);
+       if(pDisplayName != null)
+       {
+               delete pDisplayName;
+               pDisplayName = null;
+       }
        return pItem;