TSAM-4728 Do not disturb RB turn off automatically

Change-Id: If9c036cdbc4f32116444686b35b4e2b256298c01
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/src/common-efl.c b/src/common-efl.c
index 4a5814b1483de1248e4014c47c469431f696c7ce..ff5f006013644f485d8590f3f7dc84edcfe2dc0a 100755 (executable)
--- a/src/common-efl.c
+++ b/src/common-efl.c
@@ -390,29 +390,20 @@ static Evas_Object* _gl_option_content_get_cb(void *data, Evas_Object *obj, cons
 {
        retv_if(!data, NULL);
 
-       if (!strcmp(data, "set-schedule") && !strcmp("elm.swallow.end", part))
-       {
-        Evas_Object *check = elm_check_add(obj);
+    if(!strcmp(data, "do-not-disturb") && !strcmp(part, "elm.swallow.end"))
+    {
+        Evas_Object *check = NULL;
+        check = elm_check_add(obj);
         elm_object_style_set(check, "on&off");
-        elm_check_state_set(check, get_schedule());
+        elm_check_state_set(check, get_do_not_disturb());
         evas_object_show(check);
         evas_object_pass_events_set(check, 1);
+        evas_object_smart_callback_add(check, "changed", _do_not_disturb_check_changed_cb, NULL);
         evas_object_propagate_events_set(check, 0);
-        evas_object_smart_callback_add(check, "changed", set_schedule_check_changed_cb, NULL);
         return check;
-       }
-
-       if(!strcmp(data, "start-time") && !strcmp("elm.swallow.end", part))
-    {
-        return start_end_time_item(obj);
     }
 
-       if(!strcmp(data, "end-time") && !strcmp("elm.swallow.end", part))
-       {
-           return start_end_time_item(obj);
-       }
-
-       if(!strcmp(part, "elm.swallow.end") && !strcmp(data, "do-not-disturb"))
+    if(!strcmp(data, "set-schedule") && !strcmp("elm.swallow.end", part))
     {
         Evas_Object *check = elm_check_add(obj);
         elm_object_style_set(check, "on&off");
@@ -420,10 +411,20 @@ static Evas_Object* _gl_option_content_get_cb(void *data, Evas_Object *obj, cons
         evas_object_show(check);
         evas_object_pass_events_set(check, 1);
         evas_object_propagate_events_set(check, 0);
-        evas_object_smart_callback_add(check, "changed", _do_not_disturb_check_changed_cb, NULL);
+        evas_object_smart_callback_add(check, "changed", set_schedule_check_changed_cb, NULL);
         return check;
     }
-       return NULL;
+
+    if(!strcmp(data, "start-time") && !strcmp("elm.swallow.end", part))
+    {
+        return start_end_time_item(obj);
+    }
+
+    if(!strcmp(data, "end-time") && !strcmp("elm.swallow.end", part))
+    {
+        return start_end_time_item(obj);
+    }
+    return NULL;
 }
 
 static Evas_Object* _gl_app_notif_allow_all_content_get_cb(void *data, Evas_Object *obj, const char *part)