Update for sync private source

[apps/core/preloaded/smartsearch.git] / src / smartsearch.cpp

diff --git a/src/smartsearch.cpp b/src/smartsearch.cpp
index ae22250..bffe0a2 100755 (executable)
--- a/src/smartsearch.cpp
+++ b/src/smartsearch.cpp
@@ -233,6 +233,20 @@ static int __search_init_smartsearch(struct appdata *ad)
        return 0;
 }
 
+static void __search_init_category_object(struct appdata *ad)
+{
+       SEARCH_FUNC_START;
+       int i = 0;
+
+       /* Initialize Category */
+       for( i = 0 ; i < SEARCH_CATE_MAX; ++i ) {
+               ad->category_info[i].btn_icon_path = strdup(def_category[i].btn_icon_path);
+               ad->category_info[i].btn_icon_press_path = strdup(def_category[i].btn_icon_press_path);
+       }
+
+       SEARCH_FUNC_END;
+}
+
 static void __search_init_result_object(struct appdata *ad)
 {
        SEARCH_FUNC_START;
@@ -265,12 +279,6 @@ static void __search_init_result_object(struct appdata *ad)
                ret = SEARCH_RET_SEARCH_SUCCESS;
 }
 
-       /* Initialize Category */
-       for( i = 0 ; i < SEARCH_CATE_MAX; ++i ) {
-               ad->category_info[i].btn_icon_path = strdup(def_category[i].btn_icon_path);
-               ad->category_info[i].btn_icon_press_path = strdup(def_category[i].btn_icon_press_path);
-       }
-
        if( ret != SEARCH_RET_SEARCH_SUCCESS ) {
                /* If db result is NULL, initialize to default setting and insert this data to DB */
                for( i = 0; i < SEARCH_CONT_MAX ; ++i ) {
@@ -446,10 +454,9 @@ static Eina_Bool __search_init_after_ui_create(gpointer data)
                                                        __search_mousedown_event,
                                                        ad);
 
-       /* add system event callback */
-       appcore_set_event_callback(APPCORE_EVENT_REGION_CHANGE,
-                                                       search_util_date_time_format_init,
-                                                       NULL);
+       __search_init_db_connect(ad);
+       __search_init_result_object(ad);
+       search_app_connect(ad);
 
        UG_INIT_EFL(ad->win_main, UG_OPT_INDICATOR_ENABLE);
 
@@ -501,8 +508,6 @@ static bool __search_app_create(void *data)
 
        struct appdata *ad = (struct appdata *)data;
 
-       appcore_set_i18n(SEARCH_PACKAGE, LOCALEDIR);
-
        ad->win_main = __search_create_win(SEARCH_PACKAGE);
 
        SEARCH_RETV_IF(ad->win_main == NULL, -1);
@@ -511,14 +516,11 @@ static bool __search_app_create(void *data)
 
        ad->scale_factor = elm_config_scale_get();
 
+       __search_init_category_object(ad);
        __search_init_smartsearch(ad);
        search_result_gl_init(ad);
        search_util_date_time_format_init(NULL);
 
-       __search_init_db_connect(ad);
-       __search_init_result_object(ad);
-       search_app_connect(ad);
-
        ad->idler_create_ui = ecore_idler_add(__search_init_after_ui_create, ad);
 
        SEARCH_FUNC_END;
@@ -604,8 +606,11 @@ static void __search_app_service(service_h service, void *data)
 
        Evas_Object *cate_icon;
        int ret = 0;
+       char *icon_path = NULL;
 
        ad->back_btn_type = BACK_BTN_TYPE_LOWER;
+       SEARCH_FREE(ad->search_word);
+
        ret = service_get_operation(service, &operation);
 
        if (ret != 0) {
@@ -648,8 +653,11 @@ static void __search_app_service(service_h service, void *data)
 
        SEARCH_DEBUG_LOG("current category : %d", ad->search_category);
 
-       cate_icon = search_searchbar_category_icon_add(ad->category_info[ad->search_category].btn_icon_path,
-                                               ad->sb_layout);
+       cate_icon = search_searchbar_category_icon_add(icon_path,
+               ad->sb_layout,
+               SEARCH_CATEGORY_BTN_ICON_SIZE_WIDTH,
+               SEARCH_CATEGORY_BTN_ICON_SIZE_HEIGHT,
+               false);
        elm_object_content_set(ad->cate_btn, cate_icon);
 
        /* set current category to vconf */
@@ -712,7 +720,7 @@ int main(int argc, char *argv[])
        event_callback.low_battery = NULL;
        event_callback.device_orientation = NULL;
        event_callback.language_changed = __search_app_lang_change;
-       event_callback.region_format_changed = NULL;
+       event_callback.region_format_changed = search_util_date_time_format_init;
 
        memset(&ad, 0x0, sizeof(struct appdata));