Align with the reimplemented context framework

Change-Id: I0323e2f7cf97ea1e993f96df02ebcd3e27783cb9
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ab14ec..b4f1573 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ FILE(GLOB_RECURSE SRCS src/*.cpp)
 MESSAGE("Sources: ${SRCS}")
 
 # Dependencies
-SET(DEPS "gio-2.0 context-common aul bundle capi-appfw-app-control pkgmgr-info")
+SET(DEPS "gio-2.0 context-common-legacy aul bundle capi-appfw-app-control pkgmgr-info")
 
 # Common Options
 INCLUDE(FindPkgConfig)
@@ -30,7 +30,7 @@ ENDFOREACH(flag)
 ADD_LIBRARY(${target} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${target} ${api_pkg_LDFLAGS})
 SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_FLAGS ${API_EXTRA_CFLAGS})
-SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CONTEXT-API\"")
+SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CAPI-CONTEXT\"")
 SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER})
 

diff --git a/packaging/capi-context.spec b/packaging/capi-context.spec
index 1e5ee16..e3982b1 100644 (file)
--- a/packaging/capi-context.spec
+++ b/packaging/capi-context.spec
@@ -8,7 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(context-common)
+BuildRequires: pkgconfig(context-common-legacy)
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(bundle)
 BuildRequires: pkgconfig(capi-appfw-app-control)

diff --git a/src/context_history.cpp b/src/context_history.cpp
index 1cb07a0..d9864b8 100644 (file)
--- a/src/context_history.cpp
+++ b/src/context_history.cpp
@@ -150,6 +150,8 @@ SO_EXPORT int context_history_get_list(context_history_h handle, context_history
        ctx::DBusClient dbusClient;
 
        int err = dbusClient.readSync(data_type_str, filter ? filter->jfilter : NULL, &req_id, &tmp_list);
+       if (err == TIZEN_ERROR_NOT_SUPPORTED)
+               err = CONTEXT_HISTORY_ERROR_NO_DATA;
        IF_FAIL_RETURN_TAG(err == ERR_NONE, err, _E, "Getting list failed");
 
        _J("Read response", tmp_list);