Sync with the latest tizen 2.x

Change-Id: I1d9478dd97ddd7ce9118d854b650c90bdf674776

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 5d8a7d4..716d8fe 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -3,7 +3,7 @@
 
 Name: org.tizen.data-provider-slave
 Summary: Plugin type widget service provider
-Version: 1.0.0
+Version: 1.1.0
 Release: 1
 Group: Applications/Core Applications
 License: Flora-1.1

diff --git a/src/main.c b/src/main.c
index cf7f2fb..a4667eb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -484,6 +484,7 @@ static void app_control(app_control_h service, void *data)
        char *secured;
        char *hw_acceleration = NULL;
        char *abi;
+       char *auto_align;
        static int initialized = 0;
 
        if (initialized) {
@@ -518,6 +519,12 @@ static void app_control(app_control_h service, void *data)
                /* Go ahead */
        }
 
+       ret = app_control_get_extra_data(service, WIDGET_CONF_BUNDLE_SLAVE_AUTO_ALIGN, &auto_align);
+       if (ret != APP_CONTROL_ERROR_NONE) {
+               DbgPrint("Unable to get option for auto-align\n");
+               auto_align = strdup("false");
+       }
+
        if (!strcasecmp(secured, "true")) {
                /* Don't use the update timer */
                widget_turn_secured_on();
@@ -527,6 +534,7 @@ static void app_control(app_control_h service, void *data)
        DbgPrint("Secured: %s\n", secured);
        DbgPrint("hw-acceleration: %s\n", hw_acceleration);
        DbgPrint("abi: %s\n", abi);
+       DbgPrint("auto_align: %s\n", auto_align);
        ret = client_init(name, abi, hw_acceleration, widget_is_secured());
 
        if (hw_acceleration && !strcasecmp(hw_acceleration, "use-gl")) {
@@ -534,10 +542,16 @@ static void app_control(app_control_h service, void *data)
                elm_config_accel_preference_set("3d");
        }
 
+       if (auto_align && !strcasecmp(auto_align, "true")) {
+               DbgPrint("Turn on 'auto-align'\n");
+               elm_config_accel_preference_set("auto-align");
+       }
+
        free(name);
        free(secured);
        free(hw_acceleration);
        free(abi);
+       free(auto_align);
 
        initialized = 1;
        return;