diff options
Diffstat (limited to 'src/smartsearch.cpp')
| -rwxr-xr-x | src/smartsearch.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/smartsearch.cpp b/src/smartsearch.cpp index b6e11c8..c9bea6b 100755 --- a/src/smartsearch.cpp +++ b/src/smartsearch.cpp @@ -141,12 +141,10 @@ static void __search_back_btn_clicked_cb(void *data, Evas_Object *obj, void *eve struct appdata *ad = (struct appdata *)data; - if(ad->back_btn_type == BACK_BTN_TYPE_LOWER) { - /* change application window as background */ elm_win_lower(ad->win_main); - } else { + + if(ad->back_btn_type == BACK_BTN_TYPE_CLOSE) elm_exit(); - } SEARCH_FUNC_END; } @@ -272,6 +270,7 @@ static int __search_init_app_connect(struct appdata *ad) if (err != MSG_SUCCESS) { SEARCH_DEBUG_WARNING("msg_open_msg_handle error : %d", err); + ad->msg_handle = NULL; } } break; @@ -286,6 +285,7 @@ static int __search_init_app_connect(struct appdata *ad) conn_ret = media_svc_connect(&ad->media_handle); if(conn_ret < 0) { SEARCH_DEBUG_WARNING("media_svc_connect failed : %d\n", conn_ret); + ad->media_handle = NULL; } } break; @@ -345,6 +345,8 @@ static int __search_deinit_app_disconnect(void *data) if (err != MSG_SUCCESS) { SEARCH_DEBUG_WARNING("msg_close_msg_handle error : %d", err); } + + ad->msg_handle = NULL; } break; case SEARCH_TYPE_PHONE_EMAIL: @@ -357,6 +359,7 @@ static int __search_deinit_app_disconnect(void *data) if(conn_ret < 0) { SEARCH_DEBUG_WARNING("media_svc_disconnect failed : %d\n", conn_ret); } + ad->media_handle = NULL; } break; case SEARCH_TYPE_PHONE_CALENDAR: @@ -465,6 +468,9 @@ static int __search_app_terminate(void *data) search_util_date_time_format_deinit(); + SEARCH_FREE(ad->search_word); + SEARCH_FREE(ad->not_markup_search_word); + SEARCH_FUNC_END; return 0; @@ -486,7 +492,6 @@ static int __search_app_resume(void *data) struct appdata *ad = (struct appdata *)data; if (ad->win_main) { - elm_win_activate(ad->win_main); elm_object_focus_set(ad->back_btn, EINA_FALSE); } SEARCH_FUNC_END; @@ -553,7 +558,6 @@ static int __search_app_reset(bundle * b, void *data) if ((keyword) && (strlen(keyword) > 0)) { elm_object_text_set(ad->search_entry, keyword); } else { - memset(ad->search_word, 0x00, MAX_SEARCH_WORD_SIZE); elm_object_text_set(ad->search_entry, ""); elm_object_signal_emit(ad->search_bar, "cancel,hide", ""); |