refined code

Change-Id: I2ddfad81a6780d6fe8d50c2b9ac9e485296b0eab
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18f509e..3a0e25e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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))
                        {