Fix build error
authorHyukSoon Choi <hs619.choi@samsung.com>
Thu, 4 Apr 2013 01:23:21 +0000 (10:23 +0900)
committerHyukSoon Choi <hs619.choi@samsung.com>
Thu, 4 Apr 2013 01:23:21 +0000 (10:23 +0900)
Change-Id: I391b9bf13370ade9a80f01927bfc03f703966766
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>
inc/GlAlbumListPresentationModel.h
src/GlAlbumListPresentationModel.cpp
src/GlAllListSelectionPanel.cpp
src/GlFileListForm.cpp

index 1f5ce73..f290cb1 100644 (file)
@@ -59,7 +59,7 @@ public:
        void RequestThumbnail(const int folderIndex, int pathIndex);
        void CancelThumbnailRequest(const int folderIndex);
        void ClearThumbnailRequests(bool appTerminating = false);
-       result StartAppControl(const Tizen::Base::String&  providerId, const Tizen::Base::String&  operationId,
+       result StartAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId,
                        const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType,
                        const Tizen::Base::Collection::HashMap* pDataList, Tizen::App::IAppControlResponseListener* pListener);
 
index 65e5048..332c688 100644 (file)
@@ -498,8 +498,8 @@ AlbumListPresentationModel::CreateMergeBitmapN(int index)
 }
 
 result
-AlbumListPresentationModel::StartAppControl(const String&  providerId, const String&  operationId,
-               const String* pUriData, const String* pMimeType, const IMap* pDataList,
+AlbumListPresentationModel::StartAppControl(const String& providerId, const String& operationId,
+               const String* pUriData, const String* pMimeType, const HashMap* pDataList,
                IAppControlResponseListener* pListener)
 {
        AppLogDebug("ENTER");
index df30312..dab97ec 100644 (file)
@@ -584,8 +584,8 @@ AllListSelectionPanel::OnRequestEmail(void)
        pDataList->Construct();
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MAIL_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -624,7 +624,7 @@ AllListSelectionPanel::OnRequestSlideShow(void)
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
        __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
-                       pDataList, null);
+                       new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
index 93a6457..22d340e 100644 (file)
@@ -295,7 +295,8 @@ FileListForm::OnSlideSettingPopUpItemSelected(int index)
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_TYPE), new (std::nothrow) String(APPCONTROL_DATA_SLIDE_SHOW));
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-               __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW,null, pDataList, null);
+               __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
+                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
        }
        else if (index == 1) // go to settingsForm
        {