Sync with the latest code

Change-Id: I09347df0a6e78cb4e40df32c5c7f3afb7dc0d5fb

diff --git a/include/conf.h b/include/conf.h
index e8485c1..b7a1d02 100644 (file)
--- a/include/conf.h
+++ b/include/conf.h
@@ -79,6 +79,7 @@ struct conf {
        int debug_mode;
        int overwrite_content;
        int com_core_thread;
+       int use_xmonitor;
 };
 
 extern struct conf g_conf;
@@ -91,6 +92,7 @@ extern int conf_loader(void);
 #define CR 13
 #define LF 10
 
+#define USE_XMONITOR           g_conf.use_xmonitor
 #define USE_SW_BACKEND         g_conf.use_sw_backend
 #define PROVIDER_METHOD                g_conf.provider_method
 #define DEBUG_MODE             g_conf.debug_mode

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index c0e538f..cdc804a 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -2,7 +2,7 @@
 
 Name: org.tizen.data-provider-slave
 Summary: Plugin type livebox service provider.
-Version: 0.9.15
+Version: 0.9.17
 Release: 1
 Group: frameowrk/livebox
 License: Flora License

diff --git a/src/conf.c b/src/conf.c
index 99850e0..573bbb6 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -87,6 +87,7 @@ HAPI struct conf g_conf = {
        .debug_mode = 0,
        .overwrite_content = 0,
        .com_core_thread = 1,
+       .use_xmonitor = 1,
 };
 
 static void conf_update_size(void)
@@ -94,6 +95,12 @@ static void conf_update_size(void)
        ecore_x_window_size_get(0, &g_conf.width, &g_conf.height);
 }
 
+static void use_xmonitor(char *buffer)
+{
+       g_conf.use_xmonitor = !strcasecmp(buffer, "true");
+       DbgPrint("Use xmonitor: %d\n", g_conf.use_xmonitor);
+}
+
 static void use_sw_backend_handler(char *buffer)
 {
        g_conf.use_sw_backend = !strcasecmp(buffer, "true");
@@ -222,7 +229,7 @@ static void slave_ttl_handler(char *buffer)
 {
        if (sscanf(buffer, "%lf", &g_conf.slave_ttl) != 1)
                ErrPrint("Failed to parse the slave_ttl\n");
-       DbgPrint("Slave TTL: %s\n", g_conf.slave_ttl);
+       DbgPrint("Slave TTL: %lf\n", g_conf.slave_ttl);
 }
 
 static void slave_activate_time_handler(char *buffer)
@@ -444,6 +451,10 @@ HAPI int conf_loader(void)
                        .handler = use_sw_backend_handler,
                },
                {
+                       .name = "use_xmonitor",
+                       .handler = use_xmonitor,
+               },
+               {
                        .name = "provider_method",
                        .handler = provider_method_handler,
                },

diff --git a/src/main.c b/src/main.c
index 6e417f6..1f5422f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,6 +20,8 @@
 #include <malloc.h>
 #include <mcheck.h>
 
+#include <Elementary.h>
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -132,6 +134,7 @@ static bool app_create(void *data)
 
        ret = conf_loader();
        DbgPrint("Configureation manager is initiated: %d\n", ret);
+       DbgPrint("Scale factor: %lf\n", elm_config_scale_get());
 
        if (COM_CORE_THREAD)
                setenv("PROVIDER_COM_CORE_THREAD", "true", 0);