Merge branch 'tizen' into tizen_dev

Conflicts:
	src/common-efl.c
	src/set-schedule-info.c

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

diff --cc src/common-efl.c
index 9953f7a12051d3585d3851b356dfa6517642a7a8,3887b807bb8eb20ae0a4ace7e62167881ff37671..279d64fd1e5e1f3bfa9a7c79a049156b657b9b9e
--- 1/src/common-efl.c
--- 2/src/common-efl.c
+++ b/src/common-efl.c
@@@ -22,8 -22,15 +22,16 @@@
  
  #define ICON_SIZE 82
  
- extern ug_data g_ug_data;
 +extern bool isNextDay;
+ static ug_data *g_ug_data = NULL;
+ 
+ ug_data* get_app_ui_data() {
+       return g_ug_data;
+ }
+ 
+ void set_app_ui_data(ug_data *data) {
+       g_ug_data = data;
+ }
  
  Evas_Object *create_layout(Evas_Object *parent)
  {

diff --cc src/do-not-disturb-efl.c
index 760081d757a8be4fb31b9e424275685f37c79f71,a2444338b87abb5912865adade3c040b49dc3a44..652e05c6eb0514d4ea0aa7814837094be4371362
mode 100644,100755..100755
--- 1/src/do-not-disturb-efl.c
--- 2/src/do-not-disturb-efl.c
+++ b/src/do-not-disturb-efl.c

diff --cc src/set-schedule-info.c
index e0d9a5d2a66e934c5ed36e69564cd40fbba4590d,c51e55a3bbb1dffbc1080d607c21ea99c6225c16..dde21803d432a58000d9165564b83991e15680d7
mode 100644,100755..100755
--- 1/src/set-schedule-info.c
--- 2/src/set-schedule-info.c
+++ b/src/set-schedule-info.c
@@@ -17,10 -17,6 +17,9 @@@
  
  #include "set-scedule-info.h"
  #include <system_settings.h>
- extern ug_data g_ug_data;
 +#include <time.h>
 +
 +bool isNextDay = true;
  
  enum TimeFormat
      {
@@@ -216,25 -209,19 +217,28 @@@ static void popup_cancel_btn_clicked_cb
  static void popup_set_btn_clicked_cb(void *data , Evas_Object *obj , void *event_info)
  {
      NOTISET_TRACE_BEGIN;
 -    char buff[TIME_STRING_SIZE] = {0};
++    ug_data *main_data = get_app_ui_data();
++    ret_if(main_data == NULL);
++
 +    char buff[TIME_STRING_SIZE] = { 0 };
      const char *format;
      datetime_s *dt = data;
 +
      elm_datetime_value_get(dt->datetime, &dt->saved_time);
      format = elm_datetime_format_get(dt->datetime);
  
 -    if (!strcmp(format, POPUP_TIME_12_FORMAT)) {
 +    if(!strcmp(format, POPUP_TIME_12_FORMAT))
          strftime(buff, TIME_STRING_SIZE, TIME_12_FORMAT, &dt->saved_time);
 -        elm_object_text_set(dt->button, buff);
 -    } else {
 +    else
          strftime(buff, TIME_STRING_SIZE, TIME_24_FORMAT, &dt->saved_time);
 -        elm_object_text_set(dt->button, buff);
 -    }
 +
 +    double diff_time = difftime(mktime(&end_time_p.saved_time), mktime(&start_time_p.saved_time));
 +    isNextDay = diff_time <= 0 ? true : false;
 +    NOTISET_DBG("diff_time = %f", diff_time);
 +
-     elm_genlist_item_update(elm_genlist_last_item_get(g_ug_data.list_sub));
++    elm_genlist_item_update(elm_genlist_last_item_get(main_data->list_sub));
 +
 +    elm_object_text_set(dt->button, buff);
  
      evas_object_del(dt->popup);
  }