From 8a5df4dd319f06fe7eb5bf72bbff655eaf20c93a Mon Sep 17 00:00:00 2001 From: segwon Date: Wed, 30 Nov 2016 20:11:20 +0900 Subject: bug fix and add event state the APP_PAUSE, APP_RESUME, APP_TERMINATE. Signed-off-by: segwon Change-Id: If86bace16d1ab1d9ae1f398a53f88270e307c7d3 --- inc/main.h | 5 ++++- src/main.c | 6 +++--- src/ui/setting_item_device_list.c | 13 +++++++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/inc/main.h b/inc/main.h index e6b00c5..fa22698 100644 --- a/inc/main.h +++ b/inc/main.h @@ -44,7 +44,10 @@ typedef enum state { POWER_ON, DISCOVERY_START, DISCOVERY_STOP, - CHANGE_LANGUAGE + CHANGE_LANGUAGE, + APP_PAUSE, + APP_RESUME, + APP_TERMINATE } state_e; #define TITLE_TEXT dgettext(PACKAGE, "D2D_CONV_SETTING_M_TITLE_TEXT") diff --git a/src/main.c b/src/main.c index cf8dd93..5ea6046 100644 --- a/src/main.c +++ b/src/main.c @@ -48,17 +48,17 @@ static void app_control(app_control_h app_control, void *data) static void app_pause(void *data) { - // Empty + state_change_event(APP_PAUSE); } static void app_resume(void *data) { - // Empty + state_change_event(APP_RESUME); } static void app_terminate(void *data) { - // Empty + state_change_event(APP_TERMINATE); } int main(int argc, char *argv[]) diff --git a/src/ui/setting_item_device_list.c b/src/ui/setting_item_device_list.c index 85f6153..c22e9d8 100644 --- a/src/ui/setting_item_device_list.c +++ b/src/ui/setting_item_device_list.c @@ -170,13 +170,13 @@ static void gl_expanded_cb(void *data, Evas_Object *obj, void *event_info) } else if (!strcmp(ALLOWED_DEVICE_LIST_TEXT, type)) { for (index = 0; index <= permitted_devices_index; index++){ if (permitted_devices_info[index] != NULL) { - elm_genlist_item_append(list, device_item_builder, permitted_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, discovered_devices_info[index]); + elm_genlist_item_append(list, device_item_builder, permitted_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, permitted_devices_info[index]); } } } else if (!strcmp(DENIED_DEVICE_LIST_TEXT, type)) { for (index = 0; index <= denied_devices_index; index++){ if (denied_devices_info[index] != NULL) { - elm_genlist_item_append(list, device_item_builder, denied_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, discovered_devices_info[index]); + elm_genlist_item_append(list, device_item_builder, denied_devices_info[index], it, ELM_GENLIST_ITEM_NONE, device_list_select_cb, denied_devices_info[index]); } } } @@ -350,6 +350,15 @@ static void state_change_event_listener (state_e state) case CHANGE_LANGUAGE : elm_genlist_realized_items_update(group_list_item); break; + case APP_PAUSE : + discovery_stop(); + break; + case APP_RESUME : + set_acl_device_list(); + break; + case APP_TERMINATE : + discovery_stop(); + break; default : break; } -- cgit v1.2.3