Remove hardcoded path for multiuser support

Bug-Tizen: PTREL-355

Change-Id: If0c7c6cb70fba81bc8ef8518c5334ce0b4e9a823
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2e95dc..156f4a4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ pkg_check_modules(pkgs REQUIRED
        xfixes
        dri2proto
        xdamage
+       libtzplatform-config
        livebox-service # To import the error code
 )
 
@@ -49,7 +50,6 @@ ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET")
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DLOG_TAG=\"PROVIDER\"")
 ADD_DEFINITIONS("-DNDEBUG")
-ADD_DEFINITIONS("-DSLAVE_SOCKET=\"/opt/usr/share/live_magazine/.slave.socket\"")
 #ADD_DEFINITIONS("-DFLOG")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED

diff --git a/include/util.h b/include/util.h
index 7fef2eb..537b91b 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <tzplatform_config.h>
 
 extern double util_timestamp(void);
 extern const char *util_basename(const char *name);
@@ -21,6 +22,7 @@ extern const char *util_uri_to_path(const char *uri);
 #define SCHEMA_FILE    "file://"
 #define SCHEMA_PIXMAP  "pixmap://"
 #define SCHEMA_SHM     "shm://"
+#define SLAVE_SOCKET tzplatform_mkpath(TZ_USER_SHARE,"live_magazine/.slave.socket")
 
 #define container_of(ptr, type, member) \
         ({ const typeof( ((type *)0)->member ) *__mptr = (ptr);    \

diff --git a/packaging/libprovider.spec b/packaging/libprovider.spec
index 866d39f..4f29e6a 100644 (file)
--- a/packaging/libprovider.spec
+++ b/packaging/libprovider.spec
@@ -20,6 +20,8 @@ BuildRequires: pkgconfig(xfixes)
 BuildRequires: pkgconfig(dri2proto)
 BuildRequires: pkgconfig(xdamage)
 BuildRequires: pkgconfig(livebox-service)
+BuildRequires: pkgconfig(libtzplatform-config)
+Requires:      libtzplatform-config
 
 %description
 Supporting the commnuncation channel with master service for livebox remote view.