enable the messaging ipc( upgrade to tizen 2.2.1 source)

Change-Id: I72c0b8c5add87ab7dc0bd3d7ecbc20a4c1ffb288
Signed-off-by: Byounghui <byounghui.lim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e0148..cb81da9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/output")
 
 INCLUDE_DIRECTORIES (
        inc
-##     src/messaging
+       src/messaging
        src/system
        src/ui
        /usr/include/osp/system-server
@@ -35,7 +35,7 @@ pkg_check_modules(${this_target} REQUIRED
 FOREACH(flag ${${this_target}_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
-##ADD_SUBDIRECTORY(src/messaging)
+ADD_SUBDIRECTORY(src/messaging)
 ADD_SUBDIRECTORY(src/system)
 ADD_SUBDIRECTORY(src/ui)
 
@@ -59,8 +59,7 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 ADD_EXECUTABLE (${this_target} ${${this_target}_SOURCE_FILES})
 
 ## Create Shared Library
-##SET(STATIC_LIBS messaging_service system_service ui_service)
-SET(STATIC_LIBS system_service ui_service)
+SET(STATIC_LIBS messaging_service system_service ui_service)
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LINK_INTERFACE_LIBRARIES "")
 

diff --git a/inc/CommonService.h b/inc/CommonService.h
index e547828..9203505 100644 (file)
--- a/inc/CommonService.h
+++ b/inc/CommonService.h
@@ -70,7 +70,7 @@ private:
        Tizen::System::_RuntimeInfoStub* __pRuntimeInfoStub;
        Tizen::System::_DeviceManagerStub* __pDeviceManagerStub;
        Tizen::System::_PowerManagerStub* __pPowerManagerStub;
-       //std::unique_ptr<Tizen::Messaging::_MessagingIpcStub>__pMessagingIpcStub;
+       std::unique_ptr<Tizen::Messaging::_MessagingIpcStub>__pMessagingIpcStub;
 };
 
 #endif // _COMMON_SERVICE_H_

diff --git a/src/CommonService.cpp b/src/CommonService.cpp
index 180f40a..2951a1f 100644 (file)
--- a/src/CommonService.cpp
+++ b/src/CommonService.cpp
@@ -25,7 +25,7 @@
 #include "FSys_RuntimeInfoStub.h"
 #include "FSys_DeviceManagerStub.h"
 #include "FSys_PowerManagerStub.h"
-//#include "FMsg_MessagingIpcStub.h"
+#include "FMsg_MessagingIpcStub.h"
 
 using namespace std;
 using namespace Tizen::App;
@@ -40,7 +40,7 @@ CommonService::CommonService(void)
        , __pRuntimeInfoStub(null)
        , __pDeviceManagerStub(null)
        , __pPowerManagerStub(null)
-//     , __pMessagingIpcStub(null)
+       , __pMessagingIpcStub(null)
 {
 }
 
@@ -113,12 +113,12 @@ CommonService::InitializeServices(void)
        __pUiManagerStub = move(pUiManagerStub);
        SysLogException(NID_SYS, E_SUCCESS, "UI done");
 
-       //__pMessagingIpcStub.reset(new (std::nothrow) Tizen::Messaging::_MessagingIpcStub());
-       //SysTryReturnVoidResult(NID_MSG, __pMessagingIpcStub, E_OUT_OF_MEMORY, "Memory is insufficient.");
+       __pMessagingIpcStub.reset(new (std::nothrow) Tizen::Messaging::_MessagingIpcStub());
+       SysTryReturnVoidResult(NID_MSG, __pMessagingIpcStub, E_OUT_OF_MEMORY, "Memory is insufficient.");
 
-       //r = __pMessagingIpcStub->Construct();
-       //SysTryReturnVoidResult(NID_MSG, r == E_SUCCESS, r, "MsgStub Failed.");
-       //SysLogException(NID_SYS, E_SUCCESS,  "Message done");
+       r = __pMessagingIpcStub->Construct();
+       SysTryReturnVoidResult(NID_MSG, r == E_SUCCESS, r, "MsgStub Failed.");
+       SysLogException(NID_SYS, E_SUCCESS,  "Message done");
 
        __pSystemInfoService = _SystemInfoService::GetInstance();
        SysLogException(NID_SYS, E_SUCCESS, "System done");