Change the use of tfeature

 - remove TIZEN_FEATURE_CDMA
 - apply TFEATURE_FUNCTION_ENABLE_CDMA

Change-Id: I1096381a26f9249be758fd1edd39466307d0898a
Signed-off-by: sinikang <sinikang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3048b59..e79ded2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(CMAKE_INSTALL_PREFIX "${PREFIX}")
 
 # Set required packages
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED vconf glib-2.0 tcore)
+pkg_check_modules(pkgs REQUIRED vconf glib-2.0 tcore tfeature)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -34,9 +34,6 @@ ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"SP_VCONF\"")
 ADD_DEFINITIONS("-DPLUGIN_VERSION=${VERSION}")
 ADD_DEFINITIONS("-DEXPORT_API=__attribute__((visibility(\"default\")))")
 
-IF (TIZEN_FEATURE_CDMA)
-       ADD_DEFINITIONS("-DTIZEN_FEATURE_CDMA")
-ENDIF (TIZEN_FEATURE_CDMA)
 IF(PREPAID_SIM_APN_SUPPORT)
        ADD_DEFINITIONS("-DPREPAID_SIM_APN_SUPPORT")
 ENDIF(PREPAID_SIM_APN_SUPPORT)

diff --git a/packaging/tel-plugin-vconf.spec b/packaging/tel-plugin-vconf.spec
index 3e174bb..29074e1 100644 (file)
--- a/packaging/tel-plugin-vconf.spec
+++ b/packaging/tel-plugin-vconf.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 7
+%define patchlevel 8
 
 Name:           tel-plugin-vconf
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -10,9 +10,9 @@ Summary:        Telephony Vconf storage plugin
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-#BuildRequires:        model-build-features
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(tcore)
+BuildRequires:  pkgconfig(tfeature)
 BuildRequires:  pkgconfig(vconf)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -28,9 +28,7 @@ versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}]
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_INSTALL_DIR=%{_libdir} \
        -DVERSION=$versionint \
-#%if 0%{?model_build_feature_telephony_cdma}
-#      -DTIZEN_FEATURE_CDMA=1 \
-#%endif
+
 #%if 0%{?prepaid_sim_apn_support}
 #      -DPREPAID_SIM_APN_SUPPORT=1 \
 #%endif

diff --git a/src/vconf_handler.c b/src/vconf_handler.c
index 5c49d8c..658e06b 100644 (file)
--- a/src/vconf_handler.c
+++ b/src/vconf_handler.c
@@ -31,6 +31,7 @@
 #include <plugin.h>
 #include <storage.h>
 #include <co_network.h>
+#include <tfeature.h>
 
 #include "vconf_main.h"
 #include "vconf_handler.h"
@@ -215,9 +216,8 @@ static void __vconf_reset_vconfkeys()
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_CS, VCONFKEY_TELEPHONY_SVC_CS_UNKNOWN);
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_PS, VCONFKEY_TELEPHONY_SVC_PS_UNKNOWN);
        vconf_set_int(VCONFKEY_TELEPHONY_SVC_ROAM, VCONFKEY_TELEPHONY_SVC_ROAM_OFF);
-#ifdef TIZEN_FEATURE_CDMA
-       vconf_set_int(VCONFKEY_TELEPHONY_ROAM_ICON_MODE, VCONFKEY_TELEPHONY_ROAM_ICON_OFF);
-#endif
+       if (tfeature_is_supported(TFEATURE_FUNCTION_ENABLE_CDMA))
+               vconf_set_int(VCONFKEY_TELEPHONY_ROAM_ICON_MODE, VCONFKEY_TELEPHONY_ROAM_ICON_OFF);
        vconf_set_int(VCONFKEY_TELEPHONY_SIM_SLOT, VCONFKEY_TELEPHONY_SIM_UNKNOWN);
        vconf_set_int(VCONFKEY_TELEPHONY_SIM_PB_INIT, VCONFKEY_TELEPHONY_SIM_PB_INIT_NONE);
        vconf_set_int(VCONFKEY_TELEPHONY_SPN_DISP_CONDITION, VCONFKEY_TELEPHONY_DISP_INVALID);
@@ -283,10 +283,12 @@ static enum tcore_hook_return vconf_on_hook_network_icon_info(Server *s,
                dbg("Notification NOT intended for Primary Subscription");
                return TCORE_HOOK_RETURN_CONTINUE;
        }
-#ifdef TIZEN_FEATURE_CDMA
-       if (info->type & NETWORK_ICON_INFO_ROAM_ICON_MODE)
-               __vconf_check_and_set_int(VCONFKEY_TELEPHONY_ROAM_ICON_MODE, info->roam_icon_mode);
-#endif
+
+       if (tfeature_is_supported(TFEATURE_FUNCTION_ENABLE_CDMA)) {
+               if (info->type & NETWORK_ICON_INFO_ROAM_ICON_MODE)
+                       __vconf_check_and_set_int(VCONFKEY_TELEPHONY_ROAM_ICON_MODE, info->roam_icon_mode);
+       }
+
        if (info->type & NETWORK_ICON_INFO_RSSI)
                __vconf_check_and_set_int(VCONFKEY_TELEPHONY_RSSI, info->rssi);