From c934c43c0a4a8e52db2a976eb3dabe904413890f Mon Sep 17 00:00:00 2001
From: Sung-jae Park <nicesj.park@samsung.com>
Date: Thu, 19 Jun 2014 15:00:36 +0900
Subject: [PATCH] Sync the g_conf with master and provider-app, livebox

Change-Id: I532fe9aaa1a17fae3515c2e280086b422e22ecb8
---
 include/conf.h   | 13 ++++++++++++-
 src/conf.c       |  1 -
 src/so_handler.c | 27 ++-------------------------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/include/conf.h b/include/conf.h
index af7b620..c9a6fe0 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -27,6 +27,7 @@ struct conf {
 		char *abi;
 		char *pd_group;
 		double period;
+		int pixels;
 	} default_conf;
 
 	struct {
@@ -67,7 +68,6 @@ struct conf {
 		char *reader;
 		char *always;
 		char *db;
-		char *module;
 		char *input;
 	} path;
 
@@ -77,6 +77,9 @@ struct conf {
 
 	double ping_time;
 
+	char *vconf_sys_cluster;
+	int max_pended_ctx_events;
+
 	int use_sw_backend;
 	char *provider_method;
 	int debug_mode;
@@ -84,6 +87,14 @@ struct conf {
 	int com_core_thread;
 	int use_xmonitor;
 	int premultiplied;
+
+	double scale_width_factor;
+	double scale_height_factor;
+
+	double pd_request_timeout;
+
+	char *emergency_disk;
+	char *services;
 	int auto_align;
 };
 
diff --git a/src/conf.c b/src/conf.c
index 04770d7..47cf6c6 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -79,7 +79,6 @@ HAPI struct conf g_conf = {
 		 */
 		.conf = "/opt/usr/live/%s/etc/%s.conf",
 		.script = "/opt/usr/live/%s/res/script/%s.edj",
-		.module = "/opt/usr/live/%s/libexec/liblive-%s.so",
 		.input = "/dev/input/event1",
 	},
 
diff --git a/src/so_handler.c b/src/so_handler.c
index 7c33f01..d41eff7 100644
--- a/src/so_handler.c
+++ b/src/so_handler.c
@@ -65,30 +65,6 @@ static inline char *so_adaptor_alloc(const char *abi)
 	return strdup("/usr/lib/liblivebox-cpp.so");
 }
 
-static inline char *old_style_path(const char *pkgname)
-{
-	char *path;
-	int path_len;
-	int ret;
-
-	path_len = (strlen(pkgname) * 2) + strlen(MODULE_PATH);
-	path = malloc(path_len);
-	if (!path) {
-		ErrPrint("Memory: %s\n", strerror(errno));
-		return NULL;
-	}
-
-	ret = snprintf(path, path_len, MODULE_PATH, pkgname, pkgname);
-	if (ret < 0) {
-		ErrPrint("Fault: %s\n", strerror(errno));
-		free(path);
-		return NULL;
-	}
-
-	DbgPrint("Fallback to old style libexec path (%s)\n", path);
-	return path;
-}
-
 static inline char *so_path_alloc(const char *pkgname)
 {
 	char *lb_pkgname;
@@ -96,7 +72,8 @@ static inline char *so_path_alloc(const char *pkgname)
 
 	lb_pkgname = livebox_service_pkgname(pkgname);
 	if (!lb_pkgname) {
-		path = old_style_path(pkgname);
+		ErrPrint("Failed to get package name\n");
+		return NULL;
 	} else {
 		path = livebox_service_libexec(lb_pkgname);
 		free(lb_pkgname);
-- 
2.7.4