1.Nabi issue fix 2.API and Privilege Violation check

Change-Id: I8c6177726caaebe18284cc678320130d4918af43
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/src/IvImageNameEditorForm.cpp b/src/IvImageNameEditorForm.cpp
index 7895821..df07571 100644 (file)
--- a/src/IvImageNameEditorForm.cpp
+++ b/src/IvImageNameEditorForm.cpp
@@ -134,6 +134,7 @@ ImageNameEditorForm::OnTerminating(void)
                delete __pMessageBox;
                __pMessageBox = null;
        }
+       __pPresentationModel->RemoveFileUpdateListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -158,10 +159,8 @@ ImageNameEditorForm::OnActionPerformed(const Control& source, int actionId)
 
                if (__nameEditFieldPreText == inputString)
                {
-                       String msg = ResourceManager::GetString(L"IDS_MEDIABR_POP_SAME_NAME_ALREADY_IN_USE");
-                       CreateMessage(msg);
-
-                       __pNameEditField->SetFocus();
+                       __nameEditFieldPreText.Clear();
+                       pSceneManager->GoBackward(BackwardSceneTransition());
                }
                else
                {

diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp
index 5126fa1..f8fc986 100644 (file)
--- a/src/IvImageViewerForm.cpp
+++ b/src/IvImageViewerForm.cpp
@@ -225,7 +225,7 @@ ImageViewerForm::OnInitializing(void)
        {
                __pPopUp->Initialize();
                __pPopUp->SetEventListner(this);
-               AddControl(*__pPopUp);
+               AddControl(__pPopUp);
        }
 
 
@@ -321,7 +321,7 @@ ImageViewerForm::InitializeDisplay(AppControlMode status)
                        __pPlayButton->Construct(Rectangle(clientRect.width / 2 - W_PLAY_BUTTON / 2,
                                        clientRect.height / 2 - W_PLAY_BUTTON / 2, W_PLAY_BUTTON, H_PLAY_BUTTON));
                        __pPlayButton->SetActionId(IDA_CONTORL_BUTTON_PLAY);
-                       AddControl(*__pPlayButton);
+                       AddControl(__pPlayButton);
 
                        Bitmap* pNormalBackgroundBitmap = ResourceManager::GetBitmapN(IDB_IMAGE_VIEWERFORM_BUTTON_PLAY);
                        __pPlayButton->SetNormalBackgroundBitmap(*pNormalBackgroundBitmap);
@@ -427,7 +427,7 @@ ImageViewerForm::InitializeDisplay(AppControlMode status)
                        __pPlayButton->Construct(Rectangle(clientRect.width / 2 - W_PLAY_BUTTON / 2,
                                        clientRect.height / 2 - W_PLAY_BUTTON / 2, W_PLAY_BUTTON, H_PLAY_BUTTON));
                        __pPlayButton->SetActionId(IDA_CONTORL_BUTTON_PLAY);
-                       AddControl(*__pPlayButton);
+                       AddControl(__pPlayButton);
 
                        Bitmap* pNormalBackgroundBitmap = ResourceManager::GetBitmapN(IDB_IMAGE_VIEWERFORM_BUTTON_PLAY);
                        __pPlayButton->SetNormalBackgroundBitmap(*pNormalBackgroundBitmap);
@@ -637,7 +637,7 @@ ImageViewerForm::InitializePanelDetail()
 
        __pDetail_Label = new (std::nothrow) Label();
        __pDetail_Label->Construct(RECT_DETAILS_CONTORL_LABEL, ResourceManager::GetString(L"IDS_COM_BODY_DETAILS"));
-       __pScrollPanel->AddControl(*__pDetail_Label);
+       __pScrollPanel->AddControl(__pDetail_Label);
        __pDetail_Label->SetTextVerticalAlignment(ALIGNMENT_TOP);
        __pDetail_Label->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        __pDetail_Label->SetTextColor(Color::GetColor(COLOR_ID_WHITE));
@@ -650,7 +650,7 @@ ImageViewerForm::InitializePanelDetail()
                                Rectangle(X_DETAIL_FILEINFO_LABEL,
                                                GAP_H_DETAIL_TEXT * (i + 1) + H_DETAIL_MAIN_TEXT + (H_DETAIL_MAIN_TEXT + H_DETAIL_SUB_TEXT) * i,
                                                clientRect.width - GAP_W_END_OF_LABEL, H_DETAIL_FILEINFO_LABEL), ResourceManager::GetString(arrayId[i]));
-               __pScrollPanel->AddControl(*__pDetail_FileInfo_Label[i]);
+               __pScrollPanel->AddControl(__pDetail_FileInfo_Label[i]);
 
                __pDetail_FileInfo_Label[i]->SetTextVerticalAlignment(ALIGNMENT_TOP);
                __pDetail_FileInfo_Label[i]->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -674,7 +674,7 @@ ImageViewerForm::InitializePanelDetail()
                                                        clientRect.width - GAP_W_END_OF_LABEL, H_DETAIL_FILEINFO_VALUE_LABEL), L"");
                }
 
-               __pScrollPanel->AddControl(*__pDetail_FileInfo_Value_Label[i]);
+               __pScrollPanel->AddControl(__pDetail_FileInfo_Value_Label[i]);
 
                __pDetail_FileInfo_Value_Label[i]->SetTextVerticalAlignment(ALIGNMENT_TOP);
                __pDetail_FileInfo_Value_Label[i]->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -715,10 +715,10 @@ ImageViewerForm::InitializePanelDetail()
        delete pIconBackground;
 
        __pRenameButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_HEADER_BUTTON1);
-       __pScrollPanel->AddControl(*__pRenameButton);
+       __pScrollPanel->AddControl(__pRenameButton);
 
 
-       AddControl(*__pScrollPanel);
+       AddControl(__pScrollPanel);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -759,9 +759,9 @@ ImageViewerForm::InitializePopup(void)
                pCancelButton->SetActionId(IDA_DELETE_POPUP_CANCEL);
                pCancelButton->AddActionEventListener(*this);
 
-               __pDeletePopup->AddControl(*pLabel);
-               __pDeletePopup->AddControl(*pDeleteButton);
-               __pDeletePopup->AddControl(*pCancelButton);
+               __pDeletePopup->AddControl(pLabel);
+               __pDeletePopup->AddControl(pDeleteButton);
+               __pDeletePopup->AddControl(pCancelButton);
        }
        else
        {