[UI] Back button functionality added to the clock popup. 50/128550/3
authorMichal Skorupinski <m.skorupinsk@samsung.com>
Wed, 10 May 2017 10:01:01 +0000 (12:01 +0200)
committerRadek Kintop <r.kintop@samsung.com>
Thu, 11 May 2017 08:37:36 +0000 (10:37 +0200)
Change-Id: I8445dcdda968d5c940491ea040ac140c975fca99
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>
src/view/system/view_clock.c

index 7291db2..a5a0416 100755 (executable)
@@ -168,17 +168,20 @@ static input_handler h_12_24_changed = {
 
 static input_handler done_btn_handler = {
        .mouse_move = _auto_manual_mouse_move_cb,
-       .clicked = _done_mouse_cb
+       .clicked = _done_mouse_cb,
+       .key_down = _any_item_back_key_down_cb,
 };
 
 static input_handler cancel_btn_handler = {
        .mouse_move = _auto_manual_mouse_move_cb,
-       .clicked = _cancel_mouse_cb
+       .clicked = _cancel_mouse_cb,
+       .key_down = _any_item_back_key_down_cb,
 };
 
 static input_handler datetime_setup_btn_handler = {
        .mouse_move = _auto_manual_mouse_move_cb,
        .clicked = _datetime_btn_clicked_cb,
+       .key_down = _any_item_back_key_down_cb,
 };
 
 static bool _add_clock_setting(clock_view_priv_data *priv)
@@ -305,7 +308,9 @@ static Evas_Object *_create(Evas_Object *win, void *data)
 
        priv->popup = elm_popup_add(win);
        if (!priv->popup) {
-               dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] priv->popup == NULL", __FILE__, __LINE__);
+               dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] priv->popup == NULL",
+                                       __FILE__, __LINE__);
+               free(priv);
                return NULL;
        }
 
@@ -345,6 +350,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
 
        if (!_datetime_popup_create(priv)) {
                _ERR("failed to add clock setting popup");
+               free(priv);
                return NULL;
        }