Change directory path to use tzplatform-config

Change-Id: I730dafb04b54b3a47a61cc70b1521a2e81ced62d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb011aa2d491e436ca7991a3c7aa2495f20dae35..54625153daf0cd86aaf5a65a14dec8f4a159df03 100644 (file)
--- 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 3231332c4bddb868d5fdfc070ebd03380397a42a..beea97f1221f3ca689cce0e3522c9856a6bf7639 100644 (file)
--- 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 9b3f9797ee81db35b40c9c7a7225afe6c64a214b..d6428f8624c7186452e63d0af4f9e5ab98cf1307 100644 (file)
--- 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 1b4729c042bee066805949545e7e2b01087c2281..ece4f8a2a807026b97168df70c5e81868eecd66b 100644 (file)
--- 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 3a8fe7969e9bf48abafe34757336aafd4508c0cc..ddc139c99c4d1f6f67af294cb3ec3d110794c8c2 100644 (file)
--- a/src/dtapi_sat_manager.c
+++ b/src/dtapi_sat_manager.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <sys/time.h>
 
+#include <tzplatform_config.h>
 #include <tcore.h>
 #include <server.h>
 #include <plugin.h>
@@ -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; }