Link with json-glib

To initialize the json-glib object.

Change-Id: I8c97ce368e6d18b8b39138deecf731fb92f9a43c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8556601..22d2f12 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ pkg_check_modules(pkg REQUIRED
        capi-system-system-settings
        com-core
        shortcut
+       json-glib-1.0
 )
 
 SET(PACKAGE "${PROJECT_NAME}")
@@ -40,7 +41,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DPATH_MAX=256")
 ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
-ADD_DEFINITIONS("-DEXEC_NAME=\"${PROJECT_NAME}.loader\"")
 
 ADD_DEFINITIONS("-DMASTER_PKGNAME=\"data-provider-master\"")
 ADD_DEFINITIONS("-DSLAVE_PKGNAME=\"org.tizen.data-provider-slave\"")
@@ -77,7 +77,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
@@ -88,7 +88,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
@@ -97,15 +97,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}/org.tizen.data-provider-slave.desktop DESTINATION /usr/share/applications)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-slave.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "org.tizen.${PROJECT_NAME}")
-INSTALL(TARGETS "${PROJECT_NAME}.loader" DESTINATION /usr/apps/org.tizen.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-slave.rule DESTINATION /etc/smack/accesses.d)
 INSTALL(TARGETS ${ICON_PROVIDER} DESTINATION /usr/apps/org.tizen.${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/org.tizen.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

diff --git a/org.tizen.data-provider-slave.xml b/org.tizen.data-provider-slave.xml
index b7b19e8..cb77e6f 100644 (file)
--- a/org.tizen.data-provider-slave.xml
+++ b/org.tizen.data-provider-slave.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.data-provider-slave" version="0.5.4" install-location="auto">
-       <label>Data provider (native)</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>Live box data provider (native)</description>
+       <description>Dynamic Box Provider (Default)</description>
 
        <ui-application appid="org.tizen.data-provider-slave" exec="/usr/apps/org.tizen.data-provider-slave/bin/data-provider-slave" nodisplay="true" multiple="true" type="capp" taskmanage="false">
                <icon>org.tizen.data-provider-slave.png</icon>
-               <label>Data provider (native)</label>
-               <label xml:lang="en-us">Data provider (native)</label>
+               <label>Dynamic Box Provider (Default)</label>
+               <label xml:lang="en-us">Dynamic Box Provider (Default)</label>
        </ui-application>
 
        <ui-application appid="org.tizen.data-provider-slave.icon" exec="/usr/apps/org.tizen.data-provider-slave/bin/icon-provider-slave" nodisplay="true" multiple="false" type="capp" taskmanage="false">

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 0dffce8..36afcaa 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -33,6 +33,7 @@ BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(com-core)
 BuildRequires: pkgconfig(shortcut)
 BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: hash-signer
 Requires: data-provider-master
 

diff --git a/src/main.c b/src/main.c
index 046dddf..0972992 100644 (file)
--- 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>
@@ -218,6 +219,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());