diff options
| author | Young Ik Cho <youngik.cho@samsung.com> | 2013-10-16 15:07:56 +0900 |
|---|---|---|
| committer | Young Ik Cho <youngik.cho@samsung.com> | 2013-10-16 15:07:56 +0900 |
| commit | 05ed7da4129aa4afeff93adef2b3b2a791ede730 (patch) | |
| tree | c8ca0be5d5f001a22c4a6e3942b37314ac177244 | |
| parent | 2dd1bafbe9631ba6f23f8969c8241f24fd069986 (diff) | |
| download | app-service-05ed7da4129aa4afeff93adef2b3b2a791ede730.tar.gz app-service-05ed7da4129aa4afeff93adef2b3b2a791ede730.tar.bz2 app-service-05ed7da4129aa4afeff93adef2b3b2a791ede730.zip | |
refined code
Change-Id: I2ddfad81a6780d6fe8d50c2b9ac9e485296b0eab
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/osp-app-service.spec | 3 | ||||
| -rw-r--r-- | src/AppService.cpp | 11 |
3 files changed, 4 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18f509e..3a0e25e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,6 @@ ADD_SUBDIRECTORY(plugins) INCLUDE_DIRECTORIES ( src/system - /usr/include/osp/shell - /usr/include/osp/shell/core inc ) @@ -38,6 +36,7 @@ pkg_check_modules(pkgs REQUIRED chromium osp-appfw osp-appfw-server + osp-shell-core libwbxml2 ) diff --git a/packaging/osp-app-service.spec b/packaging/osp-app-service.spec index 0679d65..5b9e7e3 100644 --- a/packaging/osp-app-service.spec +++ b/packaging/osp-app-service.spec @@ -19,7 +19,7 @@ BuildRequires: pkgconfig(appsvc) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(osp-appfw) -BuildRequires: pkgconfig(osp-shell) +BuildRequires: pkgconfig(osp-shell-core) BuildRequires: pkgconfig(sysman) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(eina) @@ -34,7 +34,6 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(edbus) BuildRequires: pkgconfig(calendar-service2) BuildRequires: pkgconfig(osp-appfw-server) -BuildRequires: osp-shell-internal-devel BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(capi-system-system-settings) diff --git a/src/AppService.cpp b/src/AppService.cpp index 819057a..e940d31 100644 --- a/src/AppService.cpp +++ b/src/AppService.cpp @@ -30,12 +30,10 @@ #include <FApp_Aul.h> #include <FIo_RegistryImpl.h> #include <FSys_EnvironmentImpl.h> -#include <FBase_StringConverter.h> #include <FBaseRt_Process.h> #include "FApp_AppInfo.h" #include "FApp_AppManagerImpl.h" -#include "FApp_AppControlManager.h" #include "FApp_CommunicationDispatcher.h" #include "FApp_ContextManager.h" #include "FApp_AppManagerStub.h" @@ -458,19 +456,14 @@ AppService::LaunchUserServices(void) } result r = E_SUCCESS; - String* pPackageNameStr = null; - char* pPackageName = null; for (int i = 0; i < pAppIdList_ForLaunchOnBoot->GetCount(); i++) { - pPackageNameStr = dynamic_cast<String*>(pAppIdList_ForLaunchOnBoot->GetAt(i)); + const String* pPackageNameStr = dynamic_cast<const String*>(pAppIdList_ForLaunchOnBoot->GetAt(i)); if (pPackageNameStr != null) { - pPackageName = _StringConverter::CopyToCharArrayN(*pPackageNameStr); - SysLog(NID_APP, "'%ls'", pPackageNameStr->GetPointer()) ; - r = _AppControlManager::GetInstance()->LaunchPkg(pPackageName, null, null, null, null, null); - delete[] pPackageName; + r = _AulServer::Launch(*pPackageNameStr); if (!IsFailed(r)) { |