From face3ff5edc3fc995e76542268276e97a3e4c9f0 Mon Sep 17 00:00:00 2001
From: Sung-jae Park <nicesj.park@samsung.com>
Date: Fri, 24 Jan 2014 10:39:22 +0900
Subject: [PATCH] Link with json-glib

Change-Id: Ic4df467e1fa790e42e2cff95f79ba85441de34d8
---
 CMakeLists.txt                                 | 11 +++--------
 com.samsung.data-provider-slave.xml            |  8 ++++----
 packaging/com.samsung.data-provider-slave.spec |  1 +
 src/main.c                                     | 10 ++++++++++
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96d6684..a310fa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@ pkg_check_modules(pkg REQUIRED
 	com-core
 	shortcut
 	efl-assist
+	json-glib-1.0
 )
 
 SET(PACKAGE "${PROJECT_NAME}")
@@ -78,7 +79,7 @@ FOREACH(flag ${pkg_LDFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_LDFLAGS}")
 
-ADD_EXECUTABLE("${PROJECT_NAME}.loader"
+ADD_EXECUTABLE("${PROJECT_NAME}"
 	src/main.c
 	src/so_handler.c
 	src/fault.c
@@ -89,7 +90,7 @@ ADD_EXECUTABLE("${PROJECT_NAME}.loader"
 	src/client.c
 	src/critical_log.c
 )
-TARGET_LINK_LIBRARIES("${PROJECT_NAME}.loader" ${EXTRA_LDFLAGS})
+TARGET_LINK_LIBRARIES("${PROJECT_NAME}" ${EXTRA_LDFLAGS})
 
 ADD_EXECUTABLE(${ICON_PROVIDER}
 	icon_src/main.c
@@ -98,15 +99,9 @@ ADD_EXECUTABLE(${ICON_PROVIDER}
 )
 TARGET_LINK_LIBRARIES(${ICON_PROVIDER} ${EXTRA_LDFLAGS})
 
-ADD_EXECUTABLE(${EXE_LOADER}
-	stub/main.c
-)
-TARGET_LINK_LIBRARIES(${EXE_LOADER} ${EXTRA_LDFLAGS})
-
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.data-provider-slave.desktop DESTINATION /usr/share/applications)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.data-provider-slave.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "com.samsung.${PROJECT_NAME}")
-INSTALL(TARGETS "${PROJECT_NAME}.loader" DESTINATION /usr/apps/com.samsung.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.data-provider-slave.rule DESTINATION /etc/smack/accesses2.d)
 INSTALL(TARGETS ${ICON_PROVIDER} DESTINATION /usr/apps/com.samsung.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 INSTALL(TARGETS ${EXE_LOADER} DESTINATION /usr/apps/com.samsung.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/com.samsung.data-provider-slave.xml b/com.samsung.data-provider-slave.xml
index 3a24ed7..43b77cd 100644
--- a/com.samsung.data-provider-slave.xml
+++ b/com.samsung.data-provider-slave.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns="http://tizen.org/ns/packages" package="com.samsung.data-provider-slave" version="0.5.4" install-location="auto">
-	<label>Dynamic Box Service Provider (Default)</label>
+	<label>Dynamic Box Provider (Default)</label>
 	<author email="nicesj.park@samsung.com" href="www.samsung.com">Sung-jae Park</author>
 	<author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>
-	<description>Dynamic Box Service Provider (Default)</description>
+	<description>Dynamic Box Provider (Default)</description>
 
 	<ui-application appid="com.samsung.data-provider-slave" exec="/usr/apps/com.samsung.data-provider-slave/bin/data-provider-slave" nodisplay="true" multiple="true" type="capp" taskmanage="false">
 		<icon>com.samsung.data-provider-slave.png</icon>
-		<label>Dynamic Box Service Provider (Default)</label>
-		<label xml:lang="en-us">Dynamic Box Service Provider (Default)</label>
+		<label>Dynamic Box Provider (Default)</label>
+		<label xml:lang="en-us">Dynamic Box Provider (Default)</label>
 	</ui-application>
 	<privileges>
 		<privilege>http://tizen.org/privilege/location</privilege>
diff --git a/packaging/com.samsung.data-provider-slave.spec b/packaging/com.samsung.data-provider-slave.spec
index 17f6f72..e12d2b9 100644
--- a/packaging/com.samsung.data-provider-slave.spec
+++ b/packaging/com.samsung.data-provider-slave.spec
@@ -33,6 +33,7 @@ BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(com-core)
 BuildRequires: pkgconfig(shortcut)
 BuildRequires: pkgconfig(efl-assist)
+BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: hash-signer
 BuildRequires: pkgconfig(capi-system-system-settings)
 
diff --git a/src/main.c b/src/main.c
index 07e40f3..493c8ac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
+#include <json-glib/json-glib.h>
 #include <Ecore.h>
 #include <Ecore_X.h>
 #include <app.h>
@@ -214,6 +215,15 @@ static bool app_create(void *data)
 {
 	int ret;
 
+	/*!
+	 * Touch the glib type system
+	 */
+	JsonParser *parser;
+	parser = json_parser_new();
+	if (parser) {
+		g_object_unref(parser);
+	}
+
 	conf_update_size();
 
 	DbgPrint("Scale factor: %lf\n", elm_config_scale_get());
-- 
2.7.4