From a573f6f51e1a4d48f83d2924138624b9410cf018 Mon Sep 17 00:00:00 2001 From: Choi Munseok Date: Tue, 18 Dec 2012 10:47:16 +0900 Subject: [PATCH] Fix Livebox Change-Id: I3edac4882cdf14a802a0f00728be5a57f12349e9 Signed-off-by: Choi Munseok --- packaging/osp-shell.spec | 26 +++++------ src/CMakeLists.txt | 90 ++++++++++++++++++------------------- src/inc/FShell_LiveboxManagerImpl.h | 3 ++ 3 files changed, 61 insertions(+), 58 deletions(-) diff --git a/packaging/osp-shell.spec b/packaging/osp-shell.spec index ce4c07c..4a4bd6e 100644 --- a/packaging/osp-shell.spec +++ b/packaging/osp-shell.spec @@ -20,21 +20,21 @@ BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(appsvc) BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(minicontrol-provider) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(ail) -BuildRequires: pkgconfig(provider) -BuildRequires: pkgconfig(livebox-viewer) -BuildRequires: pkgconfig(livebox-service) -BuildRequires: pkgconfig(shortcut) -BuildRequires: pkgconfig(osp-image-core) -BuildRequires: pkgconfig(osp-media) -BuildRequires: pkgconfig(osp-net) -BuildRequires: osp-image-core-internal-devel +#BuildRequires: pkgconfig(x11) +#BuildRequires: pkgconfig(xext) +#BuildRequires: pkgconfig(glib-2.0) +#BuildRequires: pkgconfig(ail) +#BuildRequires: pkgconfig(provider) +#BuildRequires: pkgconfig(livebox-viewer) +#BuildRequires: pkgconfig(livebox-service) +#BuildRequires: pkgconfig(shortcut) +#BuildRequires: pkgconfig(osp-image-core) +#BuildRequires: pkgconfig(osp-media) +#BuildRequires: pkgconfig(osp-net) +#BuildRequires: osp-image-core-internal-devel BuildRequires: osp-appfw-internal-devel BuildRequires: osp-uifw-internal-devel -BuildRequires: boost-devel +#BuildRequires: boost-devel # runtime requires Requires: chromium diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4835401..8ea5c2c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,11 +46,11 @@ INCLUDE_DIRECTORIES( /usr/include/pixman-1 /usr/include/system /usr/include/vconf - /usr/include/shortcut - /usr/include/provider - /usr/include/livebox-service - /usr/include/livebox-viewer - /usr/include/osp/media + #/usr/include/shortcut + #/usr/include/provider + #/usr/include/livebox-service + #/usr/include/livebox-viewer + #/usr/include/osp/media ) SET (${this_target}_SOURCE_FILES @@ -58,37 +58,37 @@ SET (${this_target}_SOURCE_FILES FShell_QuickPanelFrame.cpp FShell_QuickPanelFrameImpl.cpp FShell_QuickPanelFramePresenter.cpp - FShell_LiveboxProviderImpl.cpp - FShell_LiveboxProviderInfoImpl.cpp - FShell_LiveboxSizeInfoImpl.cpp - FShell_LiveboxManagerImpl.cpp - FShell_LiveboxManagerProxy.cpp - FShellLiveboxProvider.cpp - FShellLiveboxPopupProvider.cpp - FShellLiveboxProviderInfo.cpp - FShellLiveboxSizeInfo.cpp - FShellLiveboxManager.cpp - FShell_LiveboxManagerIpcMessage.cpp - FShell_LiveboxFrame.cpp - FShell_LiveboxFrameImpl.cpp - FShell_LiveboxFrameModel.cpp - FShell_LiveboxFramePresenter.cpp - FShell_LiveboxLayer.cpp - FShell_LiveboxPopup.cpp - FShell_LiveboxPopupImpl.cpp - FShell_LiveboxPopupModel.cpp - FShell_LiveboxPopupPresenter.cpp - FShell_LiveboxPopupView.cpp - FShell_LiveboxPopupViewEvent.cpp - FShell_LiveboxPopupViewPresenter.cpp - FShell_LiveboxView.cpp - FShell_LiveboxViewImpl.cpp - FShell_LiveboxViewManager.cpp - FShell_LiveboxViewModel.cpp - FShell_LiveboxViewPresenter.cpp - FShellLiveboxFrame.cpp - FShellLiveboxPopup.cpp - FShellLiveboxView.cpp + #FShell_LiveboxProviderImpl.cpp + #FShell_LiveboxProviderInfoImpl.cpp + #FShell_LiveboxSizeInfoImpl.cpp + #FShell_LiveboxManagerImpl.cpp + #FShell_LiveboxManagerProxy.cpp + #FShellLiveboxProvider.cpp + #FShellLiveboxPopupProvider.cpp + #FShellLiveboxProviderInfo.cpp + #FShellLiveboxSizeInfo.cpp + #FShellLiveboxManager.cpp + #FShell_LiveboxManagerIpcMessage.cpp + #FShell_LiveboxFrame.cpp + #FShell_LiveboxFrameImpl.cpp + #FShell_LiveboxFrameModel.cpp + #FShell_LiveboxFramePresenter.cpp + #FShell_LiveboxLayer.cpp + #FShell_LiveboxPopup.cpp + #FShell_LiveboxPopupImpl.cpp + #FShell_LiveboxPopupModel.cpp + #FShell_LiveboxPopupPresenter.cpp + #FShell_LiveboxPopupView.cpp + #FShell_LiveboxPopupViewEvent.cpp + #FShell_LiveboxPopupViewPresenter.cpp + #FShell_LiveboxView.cpp + #FShell_LiveboxViewImpl.cpp + #FShell_LiveboxViewManager.cpp + #FShell_LiveboxViewModel.cpp + #FShell_LiveboxViewPresenter.cpp + #FShellLiveboxFrame.cpp + #FShellLiveboxPopup.cpp + #FShellLiveboxView.cpp ) ## Definitions @@ -110,7 +110,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined - TARGET_LINK_LIBRARIES(${this_target} "-lchromium" ) TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" ) TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-uifw" ) -TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-image-core" ) +#TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-image-core" ) TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-application" ) TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager" ) TARGET_LINK_LIBRARIES(${this_target} "-lnotification" ) @@ -120,14 +120,14 @@ TARGET_LINK_LIBRARIES(${this_target} "-leina" ) TARGET_LINK_LIBRARIES(${this_target} "-lecore_evas" ) TARGET_LINK_LIBRARIES(${this_target} "-lminicontrol-provider" ) #TARGET_LINK_LIBRARIES(${this_target} "-lcapi-system-runtime-info") -TARGET_LINK_LIBRARIES(${this_target} "-lX11" ) -TARGET_LINK_LIBRARIES(${this_target} "-lXext" ) -TARGET_LINK_LIBRARIES(${this_target} "-lecore_x" ) -TARGET_LINK_LIBRARIES(${this_target} "-llivebox-viewer" ) -TARGET_LINK_LIBRARIES(${this_target} "-llivebox-service" ) -TARGET_LINK_LIBRARIES(${this_target} "-lprovider" ) -TARGET_LINK_LIBRARIES(${this_target} "-lshortcut" ) -TARGET_LINK_LIBRARIES(${this_target} "-lail" ) +#TARGET_LINK_LIBRARIES(${this_target} "-lX11" ) +#TARGET_LINK_LIBRARIES(${this_target} "-lXext" ) +#TARGET_LINK_LIBRARIES(${this_target} "-lecore_x" ) +#TARGET_LINK_LIBRARIES(${this_target} "-llivebox-viewer" ) +#TARGET_LINK_LIBRARIES(${this_target} "-llivebox-service" ) +#TARGET_LINK_LIBRARIES(${this_target} "-lprovider" ) +#TARGET_LINK_LIBRARIES(${this_target} "-lshortcut" ) +#TARGET_LINK_LIBRARIES(${this_target} "-lail" ) SET_TARGET_PROPERTIES(${this_target} PROPERTIES diff --git a/src/inc/FShell_LiveboxManagerImpl.h b/src/inc/FShell_LiveboxManagerImpl.h index 20056d7..f700b44 100644 --- a/src/inc/FShell_LiveboxManagerImpl.h +++ b/src/inc/FShell_LiveboxManagerImpl.h @@ -95,6 +95,9 @@ private: bool ContainsLivebox(const Tizen::Base::String& instanceId) const; virtual void OnAppControlRequestReceivedN(RequestId reqId, const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String& category, const Tizen::Base::String* pDataType, const Tizen::Base::String* pUriScheme, Tizen::Base::Collection::IList* pArgs); + // [Temp] abc break + virtual void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData) {} + result HandleLiveboxRequest(const Tizen::Base::String& operationId, Tizen::Base::Collection::IList* pArgs); result HandleLiveboxPopupRequest(const Tizen::Base::String& operationId, Tizen::Base::Collection::IList* pArgs); -- 2.7.4