Set packageId for efltpk

[platform/framework/native/appfw.git] / src / app / FApp_ConditionManagerProxy.cpp

diff --git a/src/app/FApp_ConditionManagerProxy.cpp b/src/app/FApp_ConditionManagerProxy.cpp
index 7a941d2..2c77a29 100644 (file)
--- a/src/app/FApp_ConditionManagerProxy.cpp
+++ b/src/app/FApp_ConditionManagerProxy.cpp
@@ -22,8 +22,9 @@
 #include <new>
 #include <memory>
 
-#include <FBaseErrors.h>
+#include <unique_ptr.h>
 
+#include <FBaseErrors.h>
 #include <FBaseSysLog.h>
 #include <FIo_IpcClient.h>
 
@@ -33,10 +34,13 @@
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Io;
 
 namespace Tizen { namespace App
 {
 
+const char CONDITION_MANAGER_IPC_NAME[] = "osp.app.ipcserver.conditionmanager";
+
 _ConditionManagerProxy::_ConditionManagerProxy(void)
        : __pIpcClient(null)
 {
@@ -51,11 +55,13 @@ _ConditionManagerProxy::~_ConditionManagerProxy(void)
 result
 _ConditionManagerProxy::Construct()
 {
-       __pIpcClient = new (std::nothrow) Tizen::Io::_IpcClient();
-       SysTryReturnResult(NID_APP, __pIpcClient != null, E_OUT_OF_MEMORY, "_IpcClient creation failed.");
+       std::unique_ptr<_IpcClient> pIpcClient(new (std::nothrow) _IpcClient());
+       SysTryReturnResult(NID_APP, pIpcClient.get() != null, E_OUT_OF_MEMORY, "_IpcClient creation failed.");
+
+       result r = pIpcClient->Construct(CONDITION_MANAGER_IPC_NAME);
+       SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%%s] _IpcClient constructing faliied.", GetErrorMessage(r));
 
-       result r = __pIpcClient->Construct("osp.app.ipcserver.conditionmanager");
-       SysTryReturn(NID_APP, !IsFailed(r), r, r, "_IpcClient constructing faliied [%s].", GetErrorMessage(r));
+       __pIpcClient = pIpcClient.release();
 
        return E_SUCCESS;
 }
@@ -74,7 +80,7 @@ _ConditionManagerProxy::RegisterAppLaunch(const AppId& appId, const String& cond
 
        std::auto_ptr<IPC::Message> pMsg (new (std::nothrow) ConditionManager_RegisterAppLaunch(
                                                appId, condition, (pArrayList != null) ? *pArrayList : dummy,
-                                               (int) AppManager::LAUNCH_OPTION_DEFAULT, &response));
+                                               static_cast<int>(AppManager::LAUNCH_OPTION_DEFAULT), &response));
        result r = __pIpcClient->SendRequest(*pMsg.get());
 
        SysTryReturn(NID_APP, !IsFailed(r), r, r, "__pIpcClient->SendRequest is failed. (%s)", GetErrorMessage(r));
@@ -84,7 +90,7 @@ _ConditionManagerProxy::RegisterAppLaunch(const AppId& appId, const String& cond
 
 
 result
-_ConditionManagerProxy::UnregisterAppLaunch(const AppId& appId, /*const Tizen::Base::String& executableName,*/ const String* pCondition)
+_ConditionManagerProxy::UnregisterAppLaunch(const AppId& appId, const String* pCondition)
 {
        SysTryReturnResult(NID_APP, __pIpcClient != null, E_INVALID_STATE, "__pIpcClient instance must not be null.");
        SysLog(NID_APP, "");