From: Jiwan Kim Date: Thu, 3 Mar 2016 01:49:26 +0000 (+0900) Subject: Change directory path to use tzplatform-config X-Git-Tag: submit/tizen/20160304.043614^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26aba91ba61c735b8615c432de8f68f35e28af07;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-dbus_tapi.git Change directory path to use tzplatform-config Change-Id: I730dafb04b54b3a47a61cc70b1521a2e81ced62d --- diff --git a/CMakeLists.txt b/CMakeLists.txt index cb011aa..5462515 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ pkg_check_modules(pkgs REQUIRED aul appsvc capi-appfw-app-manager + libtzplatform-config ) FOREACH(flag ${pkgs_CFLAGS}) diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec index 3231332..beea97f 100644 --- a/packaging/tel-plugin-dbus_tapi.spec +++ b/packaging/tel-plugin-dbus_tapi.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 3 -%define patchlevel 70 +%define patchlevel 71 Name: tel-plugin-dbus_tapi Version: %{major}.%{minor}.%{patchlevel} @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(tcore) - +BuildRequires: pkgconfig(libtzplatform-config) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig diff --git a/src/dtapi_common.c b/src/dtapi_common.c index 9b3f979..d6428f8 100644 --- a/src/dtapi_common.c +++ b/src/dtapi_common.c @@ -91,7 +91,7 @@ enum dbus_tapi_sim_slot_id get_sim_slot_id_by_cp_name(const char *cp_name) return SIM_SLOT_PRIMARY; } -gboolean dbus_plugin_util_load_xml(char *docname, char *groupname, void **i_doc, void **i_root_node) +gboolean dbus_plugin_util_load_xml(const char *docname, char *groupname, void **i_doc, void **i_root_node) { xmlDocPtr *doc = (xmlDocPtr *)i_doc; xmlNodePtr *root_node = (xmlNodePtr *)i_root_node; diff --git a/src/dtapi_common.h b/src/dtapi_common.h index 1b4729c..ece4f8a 100644 --- a/src/dtapi_common.h +++ b/src/dtapi_common.h @@ -77,7 +77,7 @@ void dtapi_deinit(TcorePlugin *p); char *dbus_plugin_get_cp_name_by_object_path(const char *object_path); UserRequest *dbus_plugin_macro_user_request_new(struct custom_data *ctx, void *object, GDBusMethodInvocation *invocation); -gboolean dbus_plugin_util_load_xml(char *docname, char *groupname, void **i_doc, void **i_root_node); +gboolean dbus_plugin_util_load_xml(const char *docname, char *groupname, void **i_doc, void **i_root_node); void dbus_plugin_util_unload_xml(void **i_doc, void **i_root_node); void dtapi_dispatch_request(struct custom_data *ctx, diff --git a/src/dtapi_sat_manager.c b/src/dtapi_sat_manager.c index 3a8fe79..ddc139c 100644 --- a/src/dtapi_sat_manager.c +++ b/src/dtapi_sat_manager.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -55,7 +56,7 @@ #define SAT_USC2_INPUT_LEN_MAX 70 #define SAT_EVENT_DOWNLOAD_MAX 17 -#define LANGUAGE_XML_PATH "/opt/usr/apps/org.tizen.setting/data/langlist.xml" +#define LANGUAGE_XML_PATH tzplatform_mkpath(TZ_SYS_RO_APP, "org.tizen.setting/def_config/langlist.xml") #define SAT_CMD_Q_CHECK(index) \ if (index < SAT_DEF_CMD_Q_MIN || index > SAT_DEF_CMD_Q_MAX-1) { warn("invalid index!!"); return FALSE; }