From b0f7a7e2e3a8c6d7b6e6930c47d2151ea206597c Mon Sep 17 00:00:00 2001 From: "seolheui,kim" Date: Fri, 9 Dec 2016 18:31:05 +0900 Subject: [PATCH] Apply coding rule Change-Id: I7634184bd5185aaefda05806182a00c13f773e01 Signed-off-by: seolheui,kim --- tools/apps/kaskit/src/main.c | 51 ++++++++++++---------- tools/apps/kaskit/src/ui.c | 49 +++++++++++---------- tools/apps/keyguard/src/main.c | 16 +++---- tools/apps/keyguard/src/widget.c | 4 +- tools/apps/setup-wizard/src/security.c | 28 ++++++------ tools/apps/setup-wizard/src/util.c | 80 +++++++++++++++++----------------- tools/apps/setup-wizard/src/widget.c | 14 +++--- 7 files changed, 123 insertions(+), 119 deletions(-) diff --git a/tools/apps/kaskit/src/main.c b/tools/apps/kaskit/src/main.c index 172fb7a..4ca3427 100644 --- a/tools/apps/kaskit/src/main.c +++ b/tools/apps/kaskit/src/main.c @@ -26,23 +26,23 @@ static package_manager_h __pkg_mgr; -static const char* __pkg_blacklist[] = { +static const char *__pkg_blacklist[] = { "org.tizen.setting", "org.tizen.dpm-toolkit", NULL }; -struct app_icon_s{ - char* id; - char* label; - char* icon; - char* package; +struct app_icon_s { + char *id; + char *label; + char *icon; + char *package; bool removable; }; -static void* __create_app_icon(void* data) +static void *__create_app_icon(void *data) { - struct app_icon_s* app = (struct app_icon_s*)data; + struct app_icon_s *app = (struct app_icon_s *)data; unsigned int badge_show = 0, badge_count = 0; _create_app_icon(app->package, app->id, app->label, app->icon, app->removable); @@ -50,7 +50,7 @@ static void* __create_app_icon(void* data) int ret = badge_get_display(app->id, &badge_show); dlog_print(DLOG_ERROR, LOG_TAG, "badge_get_display err = %d", ret); if (badge_show) { - ret =badge_get_count(app->id, &badge_count); + ret = badge_get_count(app->id, &badge_count); dlog_print(DLOG_ERROR, LOG_TAG, "badge_get_count err = %d", ret); if (badge_count > 0) { _update_app_icon_badge(app->id, badge_count); @@ -60,7 +60,7 @@ static void* __create_app_icon(void* data) return NULL; } -static bool __pkg_is_removable(const char* pkg_id) +static bool __pkg_is_removable(const char *pkg_id) { bool removable = false; @@ -73,7 +73,7 @@ static bool __pkg_is_removable(const char* pkg_id) return removable; } -static bool __pkg_is_in_blacklist(const char* pkg_id) +static bool __pkg_is_in_blacklist(const char *pkg_id) { int i; for (i = 0; __pkg_blacklist[i] != NULL; i++) { @@ -84,7 +84,7 @@ static bool __pkg_is_in_blacklist(const char* pkg_id) return false; } -static bool __get_app_info_cb(app_info_h app_h, void* user_data) +static bool __get_app_info_cb(app_info_h app_h, void *user_data) { struct app_icon_s app = {NULL, }; bool nodisplay = true; @@ -122,7 +122,8 @@ static bool __get_app_info_cb(app_info_h app_h, void* user_data) return true; } -static void __create_icon_thread(void* data, Ecore_Thread* thread) { +static void __create_icon_thread(void *data, Ecore_Thread *thread) +{ app_manager_foreach_app_info(__get_app_info_cb, data); if (data != NULL) { free(data); @@ -130,11 +131,11 @@ static void __create_icon_thread(void* data, Ecore_Thread* thread) { _set_kaskit_window_exit_cb(); } -static void __pkg_event_cb(const char* type, - const char* pkg_id, - package_manager_event_type_e event_type, - package_manager_event_state_e event_state, int progress, - package_manager_error_e error, void* user_data) +static void __pkg_event_cb(const char *type, + const char *pkg_id, + package_manager_event_type_e event_type, + package_manager_event_state_e event_state, int progress, + package_manager_error_e error, void *user_data) { if (event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { if (event_type == PACKAGE_MANAGER_EVENT_TYPE_INSTALL) { @@ -145,12 +146,14 @@ static void __pkg_event_cb(const char* type, } } -static void __badge_changed_cb(unsigned int action, const char *app_id, unsigned int count, void *user_data) { +static void __badge_changed_cb(unsigned int action, const char *app_id, unsigned int count, void *user_data) +{ _update_app_icon_badge(app_id, count); } -static char* __get_current_krate_name() { +static char *__get_current_krate_name() +{ struct passwd pwd, *result; int bufsize; @@ -159,7 +162,7 @@ static char* __get_current_krate_name() { bufsize = 16384; } - char* ret, *buf = malloc(bufsize * sizeof(char)); + char *ret, *buf = malloc(bufsize * sizeof(char)); if (buf == NULL) { return NULL; @@ -179,7 +182,7 @@ void _icon_clicked_cb(const char *app_id) { app_control_h app_control; app_control_create(&app_control); - app_control_set_app_id(app_control, app_id); + app_control_set_app_id(app_control, app_id); app_control_send_launch_request(app_control, NULL, NULL); app_control_destroy(app_control); } @@ -201,8 +204,8 @@ static void __show_launcher() _set_kaskit_window_title(krate_name); package_manager_set_event_status(__pkg_mgr, - PACKAGE_MANAGER_STATUS_TYPE_INSTALL | - PACKAGE_MANAGER_STATUS_TYPE_UNINSTALL); + PACKAGE_MANAGER_STATUS_TYPE_INSTALL | + PACKAGE_MANAGER_STATUS_TYPE_UNINSTALL); package_manager_set_event_cb(__pkg_mgr, __pkg_event_cb, NULL); badge_register_changed_cb(__badge_changed_cb, NULL); diff --git a/tools/apps/kaskit/src/ui.c b/tools/apps/kaskit/src/ui.c index a7236f0..70808dc 100644 --- a/tools/apps/kaskit/src/ui.c +++ b/tools/apps/kaskit/src/ui.c @@ -24,7 +24,7 @@ static uidata_s ud = {0, }; static int __num_of_apps = 0; static bool __is_edit_mode = false; -static Ecore_Timer* __app_icon_long_press_timer = NULL; +static Ecore_Timer *__app_icon_long_press_timer = NULL; static void __block_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) { @@ -56,7 +56,7 @@ static void __set_kaskit_layout() return; } -static char* __get_res_path(const char* file) +static char *__get_res_path(const char *file) { char *res_path = NULL; char edj_path[PATH_MAX] = "\0"; @@ -78,8 +78,8 @@ static Eina_Bool key_event_cb(void *data, int type, void *event) Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event; if (!strcmp(ev->keyname, "XF86Back")) { - Evas_Object* icon; - Eina_List* i; + Evas_Object *icon; + Eina_List *i; if (__is_edit_mode) { __is_edit_mode = false; @@ -89,7 +89,7 @@ static Eina_Bool key_event_cb(void *data, int type, void *event) elm_object_signal_emit(icon, "icon_sub_badge_show", "source"); } } else { - ui_app_exit(); + ui_app_exit(); } } @@ -120,8 +120,8 @@ void _set_kaskit_window_exit_cb() static Eina_Bool __app_icon_long_press_cb(void *data) { - Evas_Object* icon; - Eina_List* i; + Evas_Object *icon; + Eina_List *i; EINA_LIST_FOREACH(ud.app_icon_list, i, icon) { if (evas_object_data_get(icon, "removable")) { @@ -141,8 +141,9 @@ void _set_kaskit_window_title(const char *title) } static int __icon_down_x, __icon_down_y; -static void __app_icon_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { - Evas_Event_Mouse_Up* ev = event_info; +static void __app_icon_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + Evas_Event_Mouse_Up *ev = event_info; __icon_down_x = ev->output.x; __icon_down_y = ev->output.y; @@ -152,11 +153,11 @@ static void __app_icon_down_cb(void *data, Evas *e, Evas_Object *obj, void *even static void __app_icon_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { - Evas_Event_Mouse_Up* ev = event_info; + Evas_Event_Mouse_Up *ev = event_info; int distance_x = (ev->output.x - __icon_down_x); int distance_y = (ev->output.y - __icon_down_y); - int distance = distance_x * distance_x + distance_y * distance_y; + int distance = distance_x * distance_x + distance_y * distance_y; if (distance > ALLOWED_ICON_DRAG_DISTANCE) { if (__app_icon_long_press_timer != NULL) { @@ -168,11 +169,11 @@ static void __app_icon_move_cb(void *data, Evas *e, Evas_Object *obj, void *even static void __app_icon_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { - Evas_Event_Mouse_Up* ev = event_info; + Evas_Event_Mouse_Up *ev = event_info; int distance_x = (ev->output.x - __icon_down_x); int distance_y = (ev->output.y - __icon_down_y); - int distance = distance_x * distance_x + distance_y * distance_y; + int distance = distance_x * distance_x + distance_y * distance_y; if (distance <= ALLOWED_ICON_DRAG_DISTANCE && !__is_edit_mode) { _icon_clicked_cb(evas_object_data_get(obj, "id")); @@ -195,7 +196,7 @@ static void __app_icon_uninstall_btn_clicked_cb(void *data, Evas_Object *obj, co _icon_uninstalled_cb(evas_object_data_get(obj, "package")); } -void _create_app_icon(const char* pkg_id, const char* app_id, const char* label, const char* icon, bool removable) +void _create_app_icon(const char *pkg_id, const char *app_id, const char *label, const char *icon, bool removable) { char string[1024] = {0, }, *default_icon; Evas_Object *icon_layout; @@ -216,16 +217,16 @@ void _create_app_icon(const char* pkg_id, const char* app_id, const char* label, evas_object_size_hint_min_set(icon_image, ICON_IMG_SIZE, ICON_IMG_SIZE); evas_object_size_hint_max_set(icon_image, ICON_IMG_SIZE, ICON_IMG_SIZE); - snprintf(string, sizeof(string), "%s", - ICON_TXT_SIZE_NORMAL, ICON_TXT_COLOR, ICON_TXT_SHADOW_COLOR, - label); + snprintf(string, sizeof(string), "%s", + ICON_TXT_SIZE_NORMAL, ICON_TXT_COLOR, ICON_TXT_SHADOW_COLOR, + label); elm_object_part_text_set(icon_layout, "icon_name", string); elm_object_part_content_set(icon_layout, "icon_content", icon_image); evas_object_data_set(icon_layout, "id", strdup(app_id)); evas_object_data_set(icon_layout, "package", strdup(pkg_id)); - evas_object_data_set(icon_layout, "removable", (const void*)removable); + evas_object_data_set(icon_layout, "removable", (const void *)removable); evas_object_event_callback_add(icon_layout, EVAS_CALLBACK_DEL, __app_icon_del_cb, NULL); evas_object_event_callback_add(icon_layout, EVAS_CALLBACK_MOUSE_DOWN, __app_icon_down_cb, NULL); @@ -249,11 +250,11 @@ void _create_app_icon(const char* pkg_id, const char* app_id, const char* label, } } -void _destroy_app_icon(const char* pkg_id) +void _destroy_app_icon(const char *pkg_id) { int index = 0; - Eina_List* i, *i_next; - Evas_Object* app_icon; + Eina_List *i, *i_next; + Evas_Object *app_icon; char *app_pkg_id; EINA_LIST_FOREACH_SAFE(ud.app_icon_list, i, i_next, app_icon) { @@ -273,10 +274,10 @@ void _destroy_app_icon(const char* pkg_id) evas_object_size_hint_min_set(ud.app_view, 0, (__num_of_apps / 3 + 1) * ICON_SIZE_H); } -void _update_app_icon_badge(const char* app_id, unsigned int count) +void _update_app_icon_badge(const char *app_id, unsigned int count) { - Eina_List* i, *i_next; - Evas_Object* app_icon; + Eina_List *i, *i_next; + Evas_Object *app_icon; char str[8], *icon_app_id; EINA_LIST_FOREACH_SAFE(ud.app_icon_list, i, i_next, app_icon) { diff --git a/tools/apps/keyguard/src/main.c b/tools/apps/keyguard/src/main.c index 8ddae52..0a9f1a1 100644 --- a/tools/apps/keyguard/src/main.c +++ b/tools/apps/keyguard/src/main.c @@ -27,7 +27,7 @@ void _launch_req_app() app_control_destroy(__req_app_control); } -bool _check_password(const char* password) +bool _check_password(const char *password) { unsigned int attempt, max_attempt, expire_sec; int ret; @@ -51,7 +51,7 @@ unsigned int _get_left_attempts() { unsigned int attempt = 0, max_attempt = 0, expire_sec; - auth_passwd_check_passwd_state(AUTH_PWD_NORMAL, &attempt, &max_attempt, &expire_sec); + auth_passwd_check_passwd_state(AUTH_PWD_NORMAL, &attempt, &max_attempt, &expire_sec); if (max_attempt == 0) { return 0xffffffff; @@ -60,7 +60,7 @@ unsigned int _get_left_attempts() return max_attempt - attempt; } -static void __launch_krate_app(const char* krate_name, app_control_h app_control) +static void __launch_krate_app(const char *krate_name, app_control_h app_control) { krate_manager_h krate_mgr; krate_app_proxy_h krate_app; @@ -72,7 +72,7 @@ static void __launch_krate_app(const char* krate_name, app_control_h app_control krate_manager_destroy(krate_mgr); } -static void __add_shortcut(const char* krate_name) +static void __add_shortcut(const char *krate_name) { char uri[PATH_MAX]; @@ -80,7 +80,7 @@ static void __add_shortcut(const char* krate_name) shortcut_add_to_home(krate_name, LAUNCH_BY_URI, uri, ICON_PATH "/shortcut_icon.png", 0, NULL, NULL); } -static void __remove_shortcut(const char* krate_name) +static void __remove_shortcut(const char *krate_name) { shortcut_remove_from_home(krate_name, NULL, NULL); } @@ -107,7 +107,7 @@ static void __app_terminate(void *data) static void __app_control(app_control_h app_control, void *data) { - char* uri, *tmp; + char *uri, *tmp; int ret = 0; ret = app_control_get_uri(app_control, &uri); @@ -141,7 +141,7 @@ static void __app_control(app_control_h app_control, void *data) ui_app_exit(); return; } else if (strncmp(tmp, "enter/", sizeof("enter/") - 1) == 0) { - char* krate_name, *launch_parameter; + char *krate_name, *launch_parameter; char new_uri[PATH_MAX]; krate_name = tmp + sizeof("enter/") - 1; @@ -166,7 +166,7 @@ static void __app_control(app_control_h app_control, void *data) ui_app_exit(); return; } else if (strncmp(tmp, "launch/", sizeof("launch/") - 1) == 0) { - char* app_id; + char *app_id; app_id = tmp + sizeof("launch/") - 1; uri = strchr(app_id, '?'); diff --git a/tools/apps/keyguard/src/widget.c b/tools/apps/keyguard/src/widget.c index a54f301..4307f18 100644 --- a/tools/apps/keyguard/src/widget.c +++ b/tools/apps/keyguard/src/widget.c @@ -39,8 +39,8 @@ static Eina_Bool key_event_cb(void *data, int type, void *event) Evas_Object *_create_win(const char *package) { - Evas_Object *win; - elm_app_base_scale_set(1.8); + Evas_Object *win; + elm_app_base_scale_set(1.8); win = elm_win_add(NULL, package, ELM_WIN_NOTIFICATION); efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); diff --git a/tools/apps/setup-wizard/src/security.c b/tools/apps/setup-wizard/src/security.c index e76f656..cb200c5 100644 --- a/tools/apps/setup-wizard/src/security.c +++ b/tools/apps/setup-wizard/src/security.c @@ -30,7 +30,7 @@ extern uidata_s ud; struct security_lock_type { - const char* text; + const char *text; int index; }; @@ -38,12 +38,12 @@ struct security_lock_type security_lock_types[] = { { "IDS_ST_BODY_PASSWORD", 0 }, }; -char* security_group_text[] = { +char *security_group_text[] = { "IDS_ST_MBODY_UNLOCK_METHOD", }; -static char* security_password_setup_data = NULL; -static char* security_password_verify_data = NULL; +static char *security_password_setup_data = NULL; +static char *security_password_verify_data = NULL; static unsigned int security_passphrase_mode = PASSPHRASE_STATE_UNDEFINED; static int security_lock_type_selected = 0; @@ -103,7 +103,7 @@ static char *security_lock_type_text_get(void *data, Evas_Object *obj, const cha static Evas_Object *security_lock_type_content_get(void *data, Evas_Object *obj, const char *part) { static Evas_Object *group = NULL; - struct security_lock_type* locktype = (struct security_lock_type *)data; + struct security_lock_type *locktype = (struct security_lock_type *)data; if (group == NULL) { group = elm_radio_add(obj); @@ -112,7 +112,7 @@ static Evas_Object *security_lock_type_content_get(void *data, Evas_Object *obj, } if (!strcmp(part, "elm.swallow.icon")) { - Evas_Object* radio = elm_radio_add(obj); + Evas_Object *radio = elm_radio_add(obj); elm_radio_state_value_set(radio, locktype->index); if (locktype->index == security_lock_type_selected) { @@ -131,11 +131,11 @@ static Evas_Object *security_lock_type_content_get(void *data, Evas_Object *obj, static void security_lock_type_select_cb(void *data, Evas_Object *obj, void *event_info) { - struct security_lock_type* locktype = (struct security_lock_type *)data; + struct security_lock_type *locktype = (struct security_lock_type *)data; elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); elm_radio_value_set(obj, locktype->index); - security_lock_type_selected = locktype->index; + security_lock_type_selected = locktype->index; } static Eina_Bool security_view_pop_cb(void *data, Elm_Object_Item *it) @@ -151,8 +151,8 @@ static Eina_Bool password_view_pop_cb(void *data, Elm_Object_Item *it) if (security_passphrase_mode != PASSPHRASE_STATE_UNDEFINED) { Evas_Object *entry = (Evas_Object *)evas_object_data_get(ud.nf, "setup_entry"); evas_object_smart_callback_add(entry, "changed", security_password_entry_changed_cb, NULL); - security_passphrase_mode--; - } + security_passphrase_mode--; + } return EINA_TRUE; } @@ -193,9 +193,9 @@ static void security_password_setup_cb(void *data, Evas_Object *obj, void *event dlog_print(DLOG_ERROR, LOG_TAG, "Password not matched"); return; } - delete_object_data(); + delete_object_data(); - ad->krate_password = security_password_setup_data; + ad->krate_password = security_password_setup_data; if (_send_krate_create_request(ad) != 0) { ui_app_exit(); @@ -234,8 +234,8 @@ static void security_password_entry_changed_cb(void *data, Evas_Object *obj, voi static void create_password_setup_view(appdata_s *ad) { - char** entry_data; - const char* title; + char **entry_data; + const char *title; Elm_Object_Item *item; Evas_Object *layout, *left_button, *right_button; Evas_Object *security_layout, *entry, *entry_title; diff --git a/tools/apps/setup-wizard/src/util.c b/tools/apps/setup-wizard/src/util.c index af439fc..e2d094a 100644 --- a/tools/apps/setup-wizard/src/util.c +++ b/tools/apps/setup-wizard/src/util.c @@ -117,26 +117,26 @@ int _send_krate_remove_request(appdata_s *ad) static int __set_notification(notification_h noti_handle, app_control_h app_control) { int ret = 0; - char *mode = NULL; - char *noti_text[2][2] = { - {"IDS_TPLATFORM_HEADER_SEPARATE_ZONE_ABB", "IDS_TPLATFORM_SBODY_TAP_HERE_TO_CREATE_PS_ABB"}, - {"IDS_TPLATFORM_HEADER_SEPARATE_ZONE_ABB", "IDS_TPLATFORM_SBODY_TAP_HERE_TO_DELETE_PS_ABB"} - }; - char **text = NULL; + char *mode = NULL; + char *noti_text[2][2] = { + {"IDS_TPLATFORM_HEADER_SEPARATE_ZONE_ABB", "IDS_TPLATFORM_SBODY_TAP_HERE_TO_CREATE_PS_ABB"}, + {"IDS_TPLATFORM_HEADER_SEPARATE_ZONE_ABB", "IDS_TPLATFORM_SBODY_TAP_HERE_TO_DELETE_PS_ABB"} + }; + char **text = NULL; char noti_content_text[PATH_MAX] = ""; char *krate_name = NULL; - if (app_control_get_extra_data(app_control, "mode", &mode) != APP_CONTROL_ERROR_NONE) - return -1; + if (app_control_get_extra_data(app_control, "mode", &mode) != APP_CONTROL_ERROR_NONE) + return -1; - if (!strcmp(mode, "create")) - text = noti_text[0]; - else - text = noti_text[1]; + if (!strcmp(mode, "create")) + text = noti_text[0]; + else + text = noti_text[1]; - ret = notification_set_text(noti_handle, NOTIFICATION_TEXT_TYPE_TITLE, __(text[0]), NULL, NOTIFICATION_VARIABLE_TYPE_NONE); - if (ret != NOTIFICATION_ERROR_NONE) - return -1; + ret = notification_set_text(noti_handle, NOTIFICATION_TEXT_TYPE_TITLE, __(text[0]), NULL, NOTIFICATION_VARIABLE_TYPE_NONE); + if (ret != NOTIFICATION_ERROR_NONE) + return -1; ret = app_control_get_extra_data(app_control, "krate", &krate_name); if (ret != APP_CONTROL_ERROR_NONE) @@ -144,42 +144,42 @@ static int __set_notification(notification_h noti_handle, app_control_h app_cont snprintf(noti_content_text, PATH_MAX, __(text[1]), krate_name); - ret = notification_set_text(noti_handle, NOTIFICATION_TEXT_TYPE_CONTENT, noti_content_text, NULL, NOTIFICATION_VARIABLE_TYPE_NONE); - if (ret != NOTIFICATION_ERROR_NONE) - return -1; + ret = notification_set_text(noti_handle, NOTIFICATION_TEXT_TYPE_CONTENT, noti_content_text, NULL, NOTIFICATION_VARIABLE_TYPE_NONE); + if (ret != NOTIFICATION_ERROR_NONE) + return -1; - ret = notification_set_display_applist(noti_handle, NOTIFICATION_DISPLAY_APP_ALL); - if (ret != NOTIFICATION_ERROR_NONE) - return -1; + ret = notification_set_display_applist(noti_handle, NOTIFICATION_DISPLAY_APP_ALL); + if (ret != NOTIFICATION_ERROR_NONE) + return -1; - ret = notification_set_image(noti_handle, NOTIFICATION_IMAGE_TYPE_THUMBNAIL, DPM_SYSPOPUP_ICON_PATH); - if (ret != NOTIFICATION_ERROR_NONE) - return -1; + ret = notification_set_image(noti_handle, NOTIFICATION_IMAGE_TYPE_THUMBNAIL, DPM_SYSPOPUP_ICON_PATH); + if (ret != NOTIFICATION_ERROR_NONE) + return -1; - ret = notification_set_launch_option(noti_handle, NOTIFICATION_LAUNCH_OPTION_APP_CONTROL, app_control); - if (ret != NOTIFICATION_ERROR_NONE) - return -1; + ret = notification_set_launch_option(noti_handle, NOTIFICATION_LAUNCH_OPTION_APP_CONTROL, app_control); + if (ret != NOTIFICATION_ERROR_NONE) + return -1; - return ret; + return ret; } void _create_notification(app_control_h app_control) { notification_h noti_handle = NULL; - int ret = 0; + int ret = 0; - noti_handle = notification_create(NOTIFICATION_TYPE_NOTI); + noti_handle = notification_create(NOTIFICATION_TYPE_NOTI); - ret = __set_notification(noti_handle, app_control); - if (ret != NOTIFICATION_ERROR_NONE) { - notification_free(noti_handle); - app_control_destroy(app_control); - return; - } + ret = __set_notification(noti_handle, app_control); + if (ret != NOTIFICATION_ERROR_NONE) { + notification_free(noti_handle); + app_control_destroy(app_control); + return; + } - notification_post(noti_handle); - notification_free(noti_handle); - app_control_destroy(app_control); + notification_post(noti_handle); + notification_free(noti_handle); + app_control_destroy(app_control); - return; + return; } diff --git a/tools/apps/setup-wizard/src/widget.c b/tools/apps/setup-wizard/src/widget.c index 61e466a..a8cdd76 100644 --- a/tools/apps/setup-wizard/src/widget.c +++ b/tools/apps/setup-wizard/src/widget.c @@ -27,19 +27,19 @@ Evas_Object *_create_win(const char *package) { Evas_Object *win; - elm_app_base_scale_set(1.8); + elm_app_base_scale_set(1.8); win = elm_win_add(NULL, package, ELM_WIN_BASIC); elm_win_indicator_mode_set(win, ELM_WIN_INDICATOR_SHOW); elm_win_indicator_opacity_set(win, ELM_WIN_INDICATOR_BG_TRANSPARENT); - elm_win_conformant_set(win, EINA_TRUE); - elm_win_autodel_set(win, EINA_TRUE); - elm_win_alpha_set(win, EINA_TRUE); + elm_win_conformant_set(win, EINA_TRUE); + elm_win_autodel_set(win, EINA_TRUE); + elm_win_alpha_set(win, EINA_TRUE); - evas_object_smart_callback_add(win, "delete,request", __win_delete_request_cb, NULL); + evas_object_smart_callback_add(win, "delete,request", __win_delete_request_cb, NULL); - return win; + return win; } Evas_Object *_create_conformant(Evas_Object *parent) @@ -132,7 +132,7 @@ Elm_Genlist_Item_Class *_create_genlist_item_class(char *style, Elm_Gen_Item_Tex return itc; } -Elm_Object_Item *_append_genlist_item(Evas_Object *genlist, Elm_Genlist_Item_Class *itc, Elm_Object_Select_Mode select_mode, void* data) +Elm_Object_Item *_append_genlist_item(Evas_Object *genlist, Elm_Genlist_Item_Class *itc, Elm_Object_Select_Mode select_mode, void *data) { Elm_Object_Item *gl_item; -- 2.7.4