fix build warning and apply tizen coding rule 46/152346/4
authorYoungjae Shin <yj99.shin@samsung.com>
Tue, 26 Sep 2017 01:55:19 +0000 (10:55 +0900)
committerjunkyu han <junkyu.han@samsung.com>
Fri, 29 Sep 2017 07:53:10 +0000 (16:53 +0900)
Change-Id: I797e2657b35e034bdea5bb6dce8d72fcfa81062c

94 files changed:
inc/add-viewer.h
inc/add-viewer_index.h
inc/event_manager.h
inc/key.h
inc/log.h
inc/page.h
inc/pkgmgr.h
inc/rotary.h
src/add-viewer.c
src/add-viewer_index.c
src/add-viewer_package.c
src/add-viewer_pkgmgr.c
src/add-viewer_ucol.c
src/add-viewer_util.c
src/animator.c
src/apps/apps_callback_manager.c
src/apps/apps_control_manager.c
src/apps/apps_data_app_info.c
src/apps/apps_data_db.c
src/apps/apps_data_manager.c
src/apps/apps_data_package_manager.c
src/apps/apps_data_xml_manager.c
src/apps/apps_db.c
src/apps/apps_key_handler.c
src/apps/apps_rotary_event_handler.c
src/apps/apps_state.c
src/apps/apps_state_edit.c
src/apps/apps_state_normal.c
src/apps/apps_view_base.c
src/apps/apps_view_circle.c
src/apps/apps_view_circle_animator.c
src/apps/apps_view_circle_icon.c
src/apps/apps_view_circle_icon_page.c
src/apps/apps_view_circle_indicator.c
src/apps/apps_view_circle_touch_handler.c
src/bg.c
src/clock.c
src/db.c
src/dbus.c
src/dbus_util.c
src/edit.c
src/effect.c
src/gesture.c
src/home_app_manager.c
src/index.c
src/item_info.c
src/key.c
src/lang.c
src/layout.c
src/main.c
src/mapbuf.c
src/moments/moments_control_brightness.c
src/moments/moments_control_do_not_disturb.c
src/moments/moments_control_flight_mode.c
src/moments/moments_control_view.c
src/moments/moments_control_volume.c
src/moments/moments_manager.c
src/moments/moments_status_view.c
src/moments/moments_view.c
src/moments/moments_view_animator.c
src/noti_broker.c
src/notification/noti_detail_view.c
src/notification/noti_event_mgr.c
src/notification/noti_panel_cover_view.c
src/notification/noti_panel_mgr.c
src/notification/noti_panel_page_view.c
src/notification/noti_panel_stack_view.c
src/notification/noti_popup_full_view.c
src/notification/noti_popup_mgr.c
src/notification/noti_popup_small_view.c
src/notification/noti_time.c
src/notification/noti_util.c
src/page.c
src/page_info.c
src/pkgmgr.c
src/popup.c
src/power_mode.c
src/screen_reader_handler.c
src/scroller.c
src/util.c
src/widget.c
src/wms.c
src/xml.c
test/feature_test/group_feature_apps_auto_open_app.c
test/feature_test/group_feature_moments_control_button_status_behavior.c
test/feature_test/group_feature_moments_controls_show.c
test/feature_test/group_feature_moments_pull_down.c
test/feature_test/group_feature_moments_status_view_ui.c
test/function_test/group_function_moments_view.c
test/test_main.c
test/unit/inc/unit.h
test/unit/inc/unit_assert.h
test/unit/unit_test/unit_test_function_test/unit_test_log_buf_function.c
test/unit/unit_test/unit_test_main.c

index 54f6f1d7a428b695ac3654d040939050200e4f60..8516bf1f4f2a61a632fb86af68ec206d40c4d10f 100755 (executable)
@@ -26,7 +26,7 @@
 #define APPSHORTCUT_WIDGET_PREVIEW RESDIR"/widget_preview/appshortcut/apps_widget_preview.png"
 #define APPSHORTCUT_WIDGET_LOCALE_PREVIEW RESDIR"/widget_preview/appshortcut/%s/apps_widget_preview.png"
 #define MOMENTS_WIDGET_ID "org.tizen.windicator"
+
 struct add_viewer_event_info {
        struct {
                Evas_Object *obj;
index 4bdbc23ce2e37718a48da54225988974d96d7e6c..0984d2b45e290ec4498465196016e25ec49879b3 100644 (file)
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
- extern void add_viewer_index_bringin(Evas_Object *index, Evas_Object *page);
- extern Evas_Object *add_viewer_index_create(Evas_Object *layout);
- extern void add_viewer_index_destroy(Evas_Object *index);
- extern void add_viewer_index_update(Evas_Object *index, Eina_List *page_list);
\ No newline at end of file
+extern void add_viewer_index_bringin(Evas_Object *index, Evas_Object *page);
+extern Evas_Object* add_viewer_index_create(Evas_Object *layout);
+extern void add_viewer_index_destroy(Evas_Object *index);
+extern void add_viewer_index_update(Evas_Object *index, Eina_List *page_list);
index a2d58080d61ee0414a275614e6b4fd65146a90a2..bfe6e03a968bc20e51c3561f34ff4b6d1e607d4c 100644 (file)
@@ -94,4 +94,4 @@ void home_event_manager_fini(void);
 int home_event_manager_allowance_get(feature_e feature);
 void home_event_manager_appcontrol_calltime_set(int enabled);
 
-#endif
\ No newline at end of file
+#endif
index ee42d9c0c06aeb53eab3d2fbb34ccfe1a8212283..83778984a378430df797976e527fb85bceb87ec1 100644 (file)
--- a/inc/key.h
+++ b/inc/key.h
@@ -31,14 +31,16 @@ typedef enum {
        KEY_TYPE_ROTARY,
 } key_type_e;
 
+typedef key_cb_ret_e (*key_cb_result_fn)(void *);
+
 /* Key callbacks are managed as a stack[LIFO] */
 extern w_home_error_e key_register_cb(
-       int type,
-       key_cb_ret_e (*result_cb)(void *), void *result_data);
+               int type,
+               key_cb_result_fn result_cb, void *result_data);
 
 extern void key_unregister_cb(
-       int type,
-       key_cb_ret_e (*result_cb)(void *));
+               int type,
+               key_cb_result_fn result_cb);
 
 extern void key_register(void);
 extern void key_unregister(void);
index 4deea212eaec7d77bd019835d4f76f240b5a3950..5c2454c6840b5ebf6ab83f7f8c1149f2dc8cfb02 100644 (file)
--- a/inc/log.h
+++ b/inc/log.h
 } while (0)
 
 #define retvm_if(expr, val, fmt, arg...) do { \
-       if(expr) { \
+       if (expr) { \
                _E(fmt, ##arg); \
                _E("(%s) -> %s() return", #expr, __FUNCTION__); \
                return val; \
 } while (0)
 
 #define retv_if(expr, val) do { \
-       if(expr) { \
+       if (expr) { \
                _E("(%s) -> %s() return", #expr, __FUNCTION__); \
                return (val); \
        } \
 } while (0)
 
 #define retm_if(expr, fmt, arg...) do { \
-       if(expr) { \
+       if (expr) { \
                _E(fmt, ##arg); \
                _E("(%s) -> %s() return", #expr, __FUNCTION__); \
                return; \
 } while (0)
 
 #define ret_if(expr) do { \
-       if(expr) { \
+       if (expr) { \
                _E("(%s) -> %s() return", #expr, __FUNCTION__); \
                return; \
        } \
 } while (0)
 
 #define goto_if(expr, val) do { \
-       if(expr) { \
+       if (expr) { \
                _E("(%s) -> goto", #expr); \
                goto val; \
        } \
 } while (0)
 
 #define break_if(expr) { \
-       if(expr) { \
+       if (expr) { \
                _E("(%s) -> break", #expr); \
                break; \
        } \
 }
 
 #define continue_if(expr) { \
-       if(expr) { \
+       if (expr) { \
                _E("(%s) -> continue", #expr); \
                continue; \
        } \
index 0f24f1017b52f960703536c6ecdeb5e8843154a0..b4bf848e02ef2c261d5462f5862ac6db1d965307 100644 (file)
@@ -33,13 +33,13 @@ typedef enum {
 } page_effect_type_e;
 
 extern void page_destroy(Evas_Object *page);
-extern Evas_Object *page_create(Evas_Object *scroller
-       , Evas_Object *item
-       , const char *id
-       , const char *subid
-       , int width, int height
-       , page_changeable_bg_e changeable_bg
-       , page_removable_e removable);
+extern Evas_Object *page_create(Evas_Object *scroller,
+               Evas_Object *item,
+               const char *id,
+               const char *subid,
+               int width, int height,
+               page_changeable_bg_e changeable_bg,
+               page_removable_e removable);
 
 /* page_set_item returns the old item. You have to delete the old item */
 extern Evas_Object *page_set_item(Evas_Object *page, Evas_Object *item);
index 52760a0bb2ee63f91f6c249b12de678f9db742d5..14bc6565b64dc40ce9650bb71e69f88aa550d155 100644 (file)
@@ -29,8 +29,8 @@ extern w_home_error_e pkgmgr_uninstall(const char *appid);
 extern w_home_error_e pkgmgr_item_list_append_item(const char *pkg_id, const char *app_id, Evas_Object *item);
 extern w_home_error_e pkgmgr_item_list_remove_item(const char *pkg_id, const char *app_id, Evas_Object *item);
 
-extern void pkgmgr_item_list_affect_pkgid(const char *pkg_id, Eina_Bool (*_affected_cb)(const char *, Evas_Object *, void *), void *data);
-extern void pkgmgr_item_list_affect_appid(const char *app_id, Eina_Bool (*_affected_cb)(const char *, Evas_Object *, void *), void *data);
+extern void pkgmgr_item_list_affect_pkgid(const char *pkg_id, Eina_Bool(*_affected_cb)(const char *, Evas_Object *, void *), void *data);
+extern void pkgmgr_item_list_affect_appid(const char *app_id, Eina_Bool(*_affected_cb)(const char *, Evas_Object *, void *), void *data);
 
 extern w_home_error_e pkgmgr_reserve_list_push_request(const char *package, const char *key, const char *val);
 extern w_home_error_e pkgmgr_reserve_list_pop_request(void);
index 5379f83f0438615bfc0b0a3f79aeac27fc1566a5..0f142503e57b945b14bcadee6e16f62bd2377b3b 100644 (file)
@@ -35,8 +35,8 @@ typedef struct appdata {
 } appdata_s;
 
 struct _menu_item {
-   char *name;
-   void (*func)(void *data, Evas_Object *obj, void *event_info);
+       char *name;
+       void (*func)(void *data, Evas_Object *obj, void *event_info);
 };
 
 #endif
index 340c627c9ebf463310d6c9e97f80910bf701cb1d..0a09df6e6d8e1a7cea14c3610d4df652c4220be3 100755 (executable)
@@ -145,9 +145,8 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
                        }
                }
 
-               if (!strcmp(widget_id, MOMENTS_WIDGET_ID)) {
+               if (!strcmp(widget_id, MOMENTS_WIDGET_ID))
                        goto out;
-               }
        }
 
        int max_instance = add_viewer_package_get_max_instance_count(package);
@@ -166,12 +165,10 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
        if (filter) {
                name = (char *)add_viewer_package_list_name(package);
                appname = (char *)add_viewer_package_list_appname(package);
-               if (add_viewer_ucol_case_search(name, filter) < 0) {
+               if (add_viewer_ucol_case_search(name, filter) < 0)
                        goto out;
-               }
-               if (add_viewer_ucol_case_search(appname, filter) < 0) {
+               if (add_viewer_ucol_case_search(appname, filter) < 0)
                        goto out;
-               }
 
                name = add_viewer_util_highlight_keyword(name, filter);
                appname = add_viewer_util_highlight_keyword(appname, filter);
@@ -194,9 +191,9 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
        elm_box_pack_end(container, thumb_item);
 
 out:
-       if (l) {
+       if (l)
                return ECORE_CALLBACK_RENEW;
-       }
+
        DbgPrint("Loading is finished\n");
 
 cancel:
@@ -263,11 +260,10 @@ static int reload_list_cb(struct add_viewer_package *package, void *data)
        }
 
        l = add_viewer_package_list_handle();
-       if (l) {
+       if (l)
                elm_object_part_text_set(widget_data->bg, "empty", "");
-       } else {
+       else
                elm_object_part_text_set(widget_data->bg, "empty", _("IDS_ST_BODY_EMPTY"));
-       }
 
        /* To set the first focus */
        evas_object_smart_callback_call(widget_data->scroller, "scroll", NULL);
@@ -465,14 +461,12 @@ static Eina_Bool register_access_object_for_edje_part(Evas_Object *object, const
        Elm_Access_Action_Type action;
 
        edje = evas_object_data_get(object, "edje");
-       if (!edje) {
+       if (!edje)
                return EINA_TRUE;
-       }
 
        content = elm_object_part_content_get(edje, part_name);
-       if (!content) {
+       if (!content)
                return EINA_TRUE;
-       }
 
        memset(&info, 0, sizeof(info));
 
@@ -523,15 +517,13 @@ static Eina_Bool activate_cb(void *part_name, Evas_Object *ao, Elm_Access_Action
        Evas_Object *part_object;
 
        part_object = evas_object_data_get(ao, "part,object");
-       if (!part_object) {
+       if (!part_object)
                return EINA_FALSE;
-       }
 
-       if (part_name) {
+       if (part_name)
                ret = register_access_object_for_edje_part(part_object, part_name);
-       } else {
+       else
                ret = make_clicked_event(part_object);
-       }
 
        return ret;
 }
@@ -607,16 +599,15 @@ static void _change_focus(Evas_Object *scroller, Evas_Object *focus_widget)
        pre_focus = evas_object_data_get(scroller, "focused");
        if (pre_focus == focus_widget) return;
 
-       if (pre_focus) {
+       if (pre_focus)
                elm_object_signal_emit(focus_widget, "show", "line");
-       } else {
+       else
                elm_object_signal_emit(focus_widget, "show,no,vi", "line");
-       }
+
        evas_object_data_set(scroller, "focused", focus_widget);
 
-       if (pre_focus && pre_focus != focus_widget) {
+       if (pre_focus && pre_focus != focus_widget)
                elm_object_signal_emit(pre_focus, "hide", "line");
-       }
 
        DbgPrint("highlight set to: %p", focus_widget);
        screen_reader_set_highlight(focus_widget, EINA_TRUE);
@@ -647,14 +638,12 @@ static void _widget_scroll_cb(void *data, Evas_Object *obj, void *event_info)
        }
 
        box = scroller_info->box;
-       if (!box) {
+       if (!box)
                return;
-       }
 
        list = elm_box_children_get(box);
-       if (!list) {
+       if (!list)
                return;
-       }
 
        evas_object_geometry_get(box, &x, &y, NULL, NULL);
        x -= (ADD_VIEWER_PAGE_WIDTH >> 1);
@@ -679,9 +668,8 @@ static int widget_data_setup(struct widget_data *widget_data, Evas_Object *paren
        widget_data->parent = parent;
 
        widget_data->bg = elm_layout_add(widget_data->parent);
-       if (!widget_data->bg) {
+       if (!widget_data->bg)
                return WIDGET_ERROR_FAULT;
-       }
 
        if (elm_layout_file_set(widget_data->bg, EDJE_FILE, "bg") != EINA_TRUE) {
                evas_object_del(widget_data->bg);
@@ -833,9 +821,8 @@ static void preview_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_i
                DbgPrint("Long press: %lf\n", fdelay);
 
                cbdata->long_press_timer = ecore_timer_add(fdelay, long_press_cb, cbdata);
-               if (!cbdata->long_press_timer) {
+               if (!cbdata->long_press_timer)
                        ErrPrint("Failed to add timer\n");
-               }
        }
 
        cbdata->x = down->canvas.x;
@@ -876,8 +863,8 @@ static void preview_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_i
 
        evas_object_geometry_get(obj, &x, &y, NULL, NULL);
 
-        dx = move->cur.canvas.x - move->prev.canvas.x;
-        dy = move->cur.canvas.y - move->prev.canvas.y;
+       dx = move->cur.canvas.x - move->prev.canvas.x;
+       dy = move->cur.canvas.y - move->prev.canvas.y;
 
        if ((abs(dx) > 5 || abs(dy) > 2 || cbdata->geo.x != x || cbdata->geo.y != y) && cbdata->long_press_timer) {
                ecore_timer_del(cbdata->long_press_timer);
@@ -911,17 +898,15 @@ static char *cur_locale(void)
                                break;
                        }
 
-                       if (*ptr == '_') {
+                       if (*ptr == '_')
                                *ptr = '-';
-                       }
 
                        ptr++;
                }
        } else {
                language = strdup("en-us");
-               if (!language) {
+               if (!language)
                        ErrPrint("Heap: %d\n", errno);
-               }
        }
 
        return language;
@@ -931,11 +916,10 @@ static void _operator_name_slide_mode_set(Evas_Object *name)
 {
        Evas_Object *name_edje;
        Evas_Object *tb;
-       Evas_Coord tb_w=0;
+       Evas_Coord tb_w = 0;
 
-       if (name == NULL) {
+       if (name == NULL)
                ErrPrint("paramter error!");
-       }
 
        elm_label_slide_mode_set(name, ELM_LABEL_SLIDE_MODE_NONE);
 
@@ -953,9 +937,9 @@ static void _operator_name_slide_mode_set(Evas_Object *name)
 
        evas_object_textblock_size_native_get(tb, &tb_w, NULL);
 
-       if((tb_w > 0) && (tb_w > ADD_VIEWER_TEXT_WIDTH)) {
+       if ((tb_w > 0) && (tb_w > ADD_VIEWER_TEXT_WIDTH))
                elm_label_slide_mode_set(name, ELM_LABEL_SLIDE_MODE_AUTO);
-       }
+
        elm_label_slide_go(name);
 }
 
@@ -990,22 +974,20 @@ static Evas_Object *winset_preview_add(struct widget_data *widget_data, Evas_Obj
                                char *locale = cur_locale();
                                if (locale) {
                                        snprintf(preview_path, sizeof(preview_path) - 1, APPSHORTCUT_WIDGET_LOCALE_PREVIEW, locale);
-                                       if (ecore_file_exists(preview_path) == EINA_TRUE) {
+                                       if (ecore_file_exists(preview_path) == EINA_TRUE)
                                                filename = strdup(preview_path);
-                                       }
+
                                        free(locale);
                                }
                                if (!filename) {
-                                       if (ecore_file_exists(APPSHORTCUT_WIDGET_PREVIEW) == EINA_TRUE) {
+                                       if (ecore_file_exists(APPSHORTCUT_WIDGET_PREVIEW) == EINA_TRUE)
                                                filename = strdup(APPSHORTCUT_WIDGET_PREVIEW);
-                                       }
                                }
                        }
                }
        }
-       if (!filename) {
+       if (!filename)
                filename = widget_service_get_preview_image_path(add_viewer_package_list_pkgname(package), type);
-       }
 
        switch (type) {
        case WIDGET_SIZE_TYPE_1x1:
@@ -1131,9 +1113,8 @@ static Evas_Object *winset_preview_add(struct widget_data *widget_data, Evas_Obj
 
        elm_object_part_content_set(preview, "preview", thumbnail);
 
-       if (!name) {
+       if (!name)
                name = add_viewer_package_list_name(package);
-       }
 
        label = elm_label_add(preview);
        if (!label) {
@@ -1142,11 +1123,11 @@ static Evas_Object *winset_preview_add(struct widget_data *widget_data, Evas_Obj
                evas_object_del(thumbnail);
                return NULL;
        }
-       if (name) {
+       if (name)
                snprintf(buf, sizeof(buf), "<align=center><color=#FFFFFF><font_size=30>%s</font_size></color></align>", name);
-       } else {
+       else
                snprintf(buf, sizeof(buf), "<align=center><color=#FFFFFF>%s</color></align>", " ");
-       }
+
        elm_object_text_set(label, buf);
        elm_object_style_set(label, "slide_short");
        elm_atspi_accessible_can_highlight_set(label, EINA_FALSE);
@@ -1294,14 +1275,12 @@ HAPI int evas_object_add_viewer_access_action(Evas_Object *obj, int type, void *
 {
        struct widget_data *widget_data;
 
-       if (!evas_object_smart_type_check(obj, ADD_VIEWER_CLASS_NAME)) {
+       if (!evas_object_smart_type_check(obj, ADD_VIEWER_CLASS_NAME))
                return WIDGET_ERROR_INVALID_PARAMETER;
-       }
 
        widget_data = evas_object_smart_data_get(obj);
-       if (!widget_data) {
+       if (!widget_data)
                return WIDGET_ERROR_FAULT;
-       }
 
        elm_access_action(widget_data->scroller, type, info);
 
@@ -1327,38 +1306,34 @@ HAPI int evas_object_add_viewer_page_move(Evas_Object *obj, int direction)
 {
        struct widget_data *widget_data;
 
-       if (!evas_object_smart_type_check(obj, ADD_VIEWER_CLASS_NAME)) {
+       if (!evas_object_smart_type_check(obj, ADD_VIEWER_CLASS_NAME))
                return WIDGET_ERROR_INVALID_PARAMETER;
-       }
 
        widget_data = evas_object_smart_data_get(obj);
-       if (!widget_data) {
+       if (!widget_data)
                return WIDGET_ERROR_FAULT;
-       }
-       if (!widget_data->scroller) {
+
+       if (!widget_data->scroller)
                return WIDGET_ERROR_FAULT;
-       }
 
        Evas_Object *box = elm_object_content_get(widget_data->scroller);
-       if (!box) {
+       if (!box)
                return WIDGET_ERROR_FAULT;
-       }
 
        Eina_List *list = elm_box_children_get(box);
-       if (!list) {
+       if (!list)
                return WIDGET_ERROR_FAULT;
-       }
 
        int x = 0, h_page = 0;
        evas_object_geometry_get(box, &x, NULL, NULL, NULL);
        x -= (ADD_VIEWER_PAGE_WIDTH >> 1);
        h_page = -(x / ADD_VIEWER_PAGE_WIDTH);
 
-       if (direction == 0) {
+       if (direction == 0)
                elm_scroller_page_bring_in(widget_data->scroller, h_page - 1, 0);
-       } else {
+       else
                elm_scroller_page_bring_in(widget_data->scroller, h_page + 1, 0);
-       }
+
        eina_list_free(list);
 
        return WIDGET_ERROR_NONE;
index fb3e2d9ee12526e2df28b89c537fd26b6d29df64..1daeefa6308e4ab6a8f0b0b8bd179010c0445d66 100755 (executable)
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #define ADD_VIEWER_DATA_KEY_INDEX_INFO "a_d_k_i"
 #define INDEX_EVEN_ITEM_NUM 20
 #define INDEX_ODD_ITEM_NUM 19
@@ -148,7 +148,8 @@ HAPI void add_viewer_index_bringin(Evas_Object *index, Evas_Object *page)
        if (idx_it) {
                elm_index_item_selected_set(idx_it, EINA_TRUE);
        } else {
-               ErrPrint("Critical, the index(%p) cannot find the page(%p:%d)", index, page, idx);
+               ErrPrint("Critical, the index(%p) cannot find the page(%p:%d)",
+                               index, page, idx);
        }
 }
 
@@ -292,4 +293,4 @@ HAPI void add_viewer_index_update(Evas_Object *index, Eina_List *page_list)
        elm_index_level_go(index, 0);
 }
 
- // End of file
+// End of file
index 4e142f013247b9b9993d4cb045b47891359bd800..922c7524993c3a25dd1f871da48186c39dec63ed 100644 (file)
@@ -103,9 +103,8 @@ static int is_preloaded(const char *pkgid)
        pkgmgrinfo_pkginfo_h handle;
 
        ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &handle);
-       if (ret != PMINFO_R_OK) {
+       if (ret != PMINFO_R_OK)
                return 0;
-       }
 
        ret = pkgmgrinfo_pkginfo_is_preload(handle, &preload);
        if (ret != PMINFO_R_OK) {
@@ -126,14 +125,14 @@ static int load_name_and_icon(struct add_viewer_package *item)
        if (item->icon && access(item->icon, R_OK) != 0) {
                char *new_icon;
                strerror_r(errno, err_buf, sizeof(err_buf));
-               ErrPrint("%s - %s\n", item->icon,err_buf );
+               ErrPrint("%s - %s\n", item->icon, err_buf);
                new_icon = strdup(RESDIR"/image/unknown.png");
                if (new_icon) {
                        free(item->icon);
                        item->icon = new_icon;
                } else {
                        strerror_r(errno, err_buf, sizeof(err_buf));
-                       ErrPrint("Heap: %s\n",err_buf );
+                       ErrPrint("Heap: %s\n", err_buf);
                }
        }
 
@@ -155,16 +154,14 @@ static int load_name_and_icon(struct add_viewer_package *item)
                        ErrPrint("Failed to get appinfo: %s\n", add_viewer_package_list_pkgname(item));
                        if (!item->name) {
                                ret = add_viewer_package_list_set_name(item, add_viewer_package_list_pkgname(item));
-                               if (ret != 0) {
+                               if (ret != 0)
                                        return ret;
-                               }
                        }
 
                        if (!item->icon) {
                                ret = add_viewer_package_list_set_icon(item, RESDIR"/image/unknown.png");
-                               if (ret != 0) {
+                               if (ret != 0)
                                        return ret;
-                               }
                        }
 
                        s_info.package_list = eina_list_sorted_insert(s_info.package_list, sort_cb, item);
@@ -189,9 +186,8 @@ static int load_name_and_icon(struct add_viewer_package *item)
                if (!item->name) {
                        char *name;
                        ret = pkgmgrinfo_appinfo_get_label(ai, &name);
-                       if (ret != PMINFO_R_OK || !name) {
+                       if (ret != PMINFO_R_OK || !name)
                                name = item->pkgname;
-                       }
 
                        ret = add_viewer_package_list_set_name(item, name);
                        if (ret != 0) {
@@ -257,9 +253,8 @@ static int widget_list_callback(const char *appid, const char *widget_id, int is
                switch (size_types[cnt]) {
                case WIDGET_SIZE_TYPE_2x2:
 #if defined(CHECK_PRELOAD)
-                       if (preloaded) {
+                       if (preloaded)
                                continue;
-                       }
 #endif
                        preview = calloc(1, sizeof(*preview));
                        if (!preview) {
@@ -314,7 +309,7 @@ static int widget_list_callback(const char *appid, const char *widget_id, int is
 
        item->pkgname = strdup(widget_id);
        if (!item->pkgname) {
-               strerror_r(errno,err_buf, sizeof(err_buf));
+               strerror_r(errno, err_buf, sizeof(err_buf));
                ErrPrint("Heap: %s\n", err_buf);
                free(item);
                EINA_LIST_FREE(preview_list, preview) {
@@ -327,7 +322,7 @@ static int widget_list_callback(const char *appid, const char *widget_id, int is
        item->pkgid = strdup(appid);
        if (!item->pkgid) {
                strerror_r(errno, err_buf, sizeof(err_buf));
-               ErrPrint("Heap: %s\n",err_buf );
+               ErrPrint("Heap: %s\n", err_buf);
                free(item->pkgname);
                free(item);
                EINA_LIST_FREE(preview_list, preview) {
@@ -504,9 +499,8 @@ static void widget_del_by_appid(const char *appid)
 
 static int pkgmgr_install_cb(const char *pkgname, enum pkgmgr_status status, double value, void *data)
 {
-       if (status != PKGMGR_STATUS_END) {
+       if (status != PKGMGR_STATUS_END)
                return 0;
-       }
 
        widget_service_get_widget_list_by_pkgid(pkgname, widget_add_by_pkgid_cb, NULL);
 
@@ -516,13 +510,11 @@ static int pkgmgr_install_cb(const char *pkgname, enum pkgmgr_status status, dou
 
 static int pkgmgr_uninstall_cb(const char *pkgname, enum pkgmgr_status status, double value, void *data)
 {
-       if (status != PKGMGR_STATUS_START) {
+       if (status != PKGMGR_STATUS_START)
                return 0;
-       }
 
-       if (widget_service_get_widget_list_by_pkgid(pkgname, widget_del_by_pkgid_cb, NULL) <= 0) {
+       if (widget_service_get_widget_list_by_pkgid(pkgname, widget_del_by_pkgid_cb, NULL) <= 0)
                widget_del_by_appid(pkgname);
-       }
 
        invoke_reload_event_callback();
        return 0;
@@ -530,11 +522,11 @@ static int pkgmgr_uninstall_cb(const char *pkgname, enum pkgmgr_status status, d
 
 static int pkgmgr_update_cb(const char *pkgname, enum pkgmgr_status status, double value, void *data)
 {
-       if (status == PKGMGR_STATUS_START) {
+       if (status == PKGMGR_STATUS_START)
                widget_service_get_widget_list_by_pkgid(pkgname, widget_del_by_pkgid_cb, NULL);
-       } else if (status == PKGMGR_STATUS_END) {
+       else if (status == PKGMGR_STATUS_END)
                widget_service_get_widget_list_by_pkgid(pkgname, widget_add_by_pkgid_cb, NULL);
-       }
+
 
        invoke_reload_event_callback();
        return 0;
@@ -545,25 +537,21 @@ HAPI int add_viewer_package_init(void)
        int ret;
        int cnt = 0;
 
-       if (s_info.initialized) {
+       if (s_info.initialized)
                return 0;
-       }
 
        s_info.initialized = 1;
 
        ret = add_viewer_pkgmgr_init();
-       if (ret != WIDGET_ERROR_NONE && ret != WIDGET_ERROR_ALREADY_STARTED) {
+       if (ret != WIDGET_ERROR_NONE && ret != WIDGET_ERROR_ALREADY_STARTED)
                ErrPrint("Failed to initialize the pkgmgr\n");
-       }
 
 
        ret = widget_service_get_widget_list(widget_list_callback, NULL);
-       if (ret > 0) {
+       if (ret > 0)
                cnt += ret;
-       } else {
+       else
                ErrPrint("Failed to get widget list:%d\n", ret);
-       }
-
 
        add_viewer_pkgmgr_add_event_callback(PKGMGR_EVENT_INSTALL, pkgmgr_install_cb, NULL);
        add_viewer_pkgmgr_add_event_callback(PKGMGR_EVENT_UPDATE, pkgmgr_update_cb, NULL);
@@ -577,9 +565,8 @@ HAPI int add_viewer_package_fini(void)
        struct add_viewer_package *item;
        struct add_viewer_preview *preview;
 
-       if (!s_info.initialized) {
+       if (!s_info.initialized)
                return 0;
-       }
 
        add_viewer_pkgmgr_del_event_callback(PKGMGR_EVENT_INSTALL, pkgmgr_install_cb, NULL);
        add_viewer_pkgmgr_del_event_callback(PKGMGR_EVENT_UPDATE, pkgmgr_update_cb, NULL);
@@ -622,18 +609,16 @@ HAPI void *add_viewer_package_list_next(void *handle)
 {
        handle = eina_list_next(handle);
 
-       if (!handle || s_info.package_list == handle) {
+       if (!handle || s_info.package_list == handle)
                return NULL;
-       }
 
        return handle;
 }
 
 HAPI void *add_viewer_package_list_prev(void *handle)
 {
-       if (!handle || handle == s_info.package_list) {
+       if (!handle || handle == s_info.package_list)
                return NULL;
-       }
 
        return eina_list_prev(handle);
 }
@@ -741,9 +726,8 @@ HAPI int add_viewer_package_list_set_name(struct add_viewer_package *package, co
                new_name = NULL;
        }
 
-       if (package->name) {
+       if (package->name)
                free(package->name);
-       }
 
        package->name = new_name;
        return 0;
@@ -763,9 +747,8 @@ HAPI int add_viewer_package_list_set_pkgname(struct add_viewer_package *package,
                new_name = NULL;
        }
 
-       if (package->pkgname) {
+       if (package->pkgname)
                free(package->pkgname);
-       }
 
        package->pkgname = new_name;
        return 0;
@@ -785,9 +768,8 @@ HAPI int add_viewer_package_list_set_icon(struct add_viewer_package *package, co
                new_name = NULL;
        }
 
-       if (package->icon) {
+       if (package->icon)
                free(package->icon);
-       }
 
        package->icon = new_name;
        return 0;
@@ -801,16 +783,15 @@ HAPI int add_viewer_package_list_set_appname(struct add_viewer_package *package,
                new_name = strdup(appname);
                if (!new_name) {
                        strerror_r(errno, err_buf, sizeof(err_buf));
-                       ErrPrint("Heap: %s\n",err_buf );
+                       ErrPrint("Heap: %s\n", err_buf);
                        return -ENOMEM;
                }
        } else {
                new_name = NULL;
        }
 
-       if (package->appname) {
+       if (package->appname)
                free(package->appname);
-       }
 
        package->appname = new_name;
        return 0;
@@ -818,12 +799,11 @@ HAPI int add_viewer_package_list_set_appname(struct add_viewer_package *package,
 
 HAPI int add_viewer_package_get_widget_count_in_package(struct add_viewer_package *package)
 {
-       if (!package) {
+       if (!package)
                return 0;
-       }
-       if (!package->pkgid) {
+
+       if (!package->pkgid)
                return 0;
-       }
 
        int count = 0;
        Eina_List *l;
@@ -832,9 +812,8 @@ HAPI int add_viewer_package_get_widget_count_in_package(struct add_viewer_packag
        EINA_LIST_FOREACH(s_info.package_list, l, package_node) {
                if (package_node) {
                        if (package_node->pkgid) {
-                               if (!strcmp(package_node->pkgid, package->pkgid)) {
+                               if (!strcmp(package_node->pkgid, package->pkgid))
                                        count++;
-                               }
                        }
                }
        }
@@ -875,18 +854,16 @@ HAPI struct add_viewer_preview *add_viewer_package_list_preview(struct add_viewe
 HAPI void *add_viewer_package_list_preview_next(struct add_viewer_package *package, void *handle)
 {
        handle = eina_list_next(handle);
-       if (!handle || handle == package->preview_list) {
+       if (!handle || handle == package->preview_list)
                return NULL;
-       }
 
        return handle;
 }
 
 HAPI void *add_viewer_package_list_preview_prev(struct add_viewer_package *package, void *handle)
 {
-       if (!handle || handle == package->preview_list) {
+       if (!handle || handle == package->preview_list)
                return NULL;
-       }
 
        handle = eina_list_prev(handle);
        return handle;
@@ -920,9 +897,8 @@ HAPI void add_viewer_package_set_disabled(struct add_viewer_package *package, in
 HAPI void add_viewer_package_set_skip(struct add_viewer_package *package, int skip)
 {
        if (skip == 0) {
-               if (package->skipped > 0) {
+               if (package->skipped > 0)
                        package->skipped--;
-               }
        } else {
                package->skipped++;
        }
@@ -949,9 +925,8 @@ HAPI struct add_viewer_package *add_viewer_package_find(const char *widget_id)
        struct add_viewer_package *package;
 
        EINA_LIST_FOREACH(s_info.package_list, l, package) {
-               if (!strcmp(package->pkgname, widget_id)) {
+               if (!strcmp(package->pkgname, widget_id))
                        return package;
-               }
        }
 
        return NULL;
index 3bed852c3c90ac1b3968f6754e6cd8dda70fd972..f05f3d26b8807c44823a3a15c0359ec5d0340d4b 100644 (file)
@@ -77,9 +77,8 @@ static inline void invoke_install_event_handler(const char *pkgname, enum pkgmgr
        struct event_item *item;
 
        EINA_LIST_FOREACH(s_info.install_event, l, item) {
-               if (item->cb) {
+               if (item->cb)
                        item->cb(pkgname, status, value, item->data);
-               }
        }
 }
 
@@ -89,9 +88,8 @@ static inline void invoke_uninstall_event_handler(const char *pkgname, enum pkgm
        struct event_item *item;
 
        EINA_LIST_FOREACH(s_info.uninstall_event, l, item) {
-               if (item->cb) {
+               if (item->cb)
                        item->cb(pkgname, status, value, item->data);
-               }
        }
 }
 
@@ -101,9 +99,8 @@ static inline void invoke_update_event_handler(const char *pkgname, enum pkgmgr_
        struct event_item *item;
 
        EINA_LIST_FOREACH(s_info.update_event, l, item) {
-               if (item->cb) {
+               if (item->cb)
                        item->cb(pkgname, status, value, item->data);
-               }
        }
 }
 
@@ -113,9 +110,8 @@ static inline void invoke_download_event_handler(const char *pkgname, enum pkgmg
        struct event_item *item;
 
        EINA_LIST_FOREACH(s_info.download_event, l, item) {
-               if (item->cb) {
+               if (item->cb)
                        item->cb(pkgname, status, value, item->data);
-               }
        }
 }
 
@@ -125,9 +121,8 @@ static inline void invoke_recover_event_handler(const char *pkgname, enum pkgmgr
        struct event_item *item;
 
        EINA_LIST_FOREACH(s_info.recover_event, l, item) {
-               if (item->cb) {
+               if (item->cb)
                        item->cb(pkgname, status, value, item->data);
-               }
        }
 }
 
@@ -193,9 +188,8 @@ static struct item *find_item(const char *pkgname)
        }
 
        EINA_LIST_FOREACH(s_info.item_list, l, item) {
-               if (strcmp(item->pkgname, pkgname)) {
+               if (strcmp(item->pkgname, pkgname))
                        continue;
-               }
 
                return item;
        }
@@ -212,14 +206,14 @@ static int start_cb(const char *pkgname, const char *val, void *data)
 
        item = calloc(1, sizeof(*item));
        if (!item) {
-               char err_buf[256] = { 0, };             
+               char err_buf[256] = { 0, };
                ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        item->pkgname = strdup(pkgname);
        if (!item->pkgname) {
-               char err_buf[256] = { 0, };             
+               char err_buf[256] = { 0, };
                ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                DbgFree(item);
                return WIDGET_ERROR_OUT_OF_MEMORY;
@@ -257,13 +251,11 @@ static int icon_path_cb(const char *pkgname, const char *val, void *data)
        DbgPrint("[%s] %s\n", pkgname, val);
 
        item = find_item(pkgname);
-       if (!item) {
+       if (!item)
                return WIDGET_ERROR_NOT_EXIST;
-       }
 
-       if (item->icon) {
+       if (item->icon)
                DbgFree(item->icon);
-       }
 
        item->icon = strdup(val);
        if (!item->icon) {
@@ -282,9 +274,8 @@ static int command_cb(const char *pkgname, const char *val, void *data)
        DbgPrint("[%s] %s\n", pkgname, val);
 
        item = find_item(pkgname);
-       if (!item) {
+       if (!item)
                return WIDGET_ERROR_NOT_EXIST;
-       }
 
        if (!is_valid_status(item, val)) {
                DbgPrint("Invalid status: %d, %s\n", item->type, val);
@@ -304,9 +295,8 @@ static int error_cb(const char *pkgname, const char *val, void *data)
        DbgPrint("[%s] %s\n", pkgname, val);
 
        item = find_item(pkgname);
-       if (!item) {
+       if (!item)
                return WIDGET_ERROR_NOT_EXIST;
-       }
 
        item->status = PKGMGR_STATUS_ERROR;
        invoke_callback(pkgname, item, 0.0f);
@@ -321,13 +311,12 @@ static int change_pkgname_cb(const char *pkgname, const char *val, void *data)
        DbgPrint("[%s] %s\n", pkgname, val);
 
        item = find_item(pkgname);
-       if (!item) {
+       if (!item)
                return WIDGET_ERROR_NOT_EXIST;
-       }
 
        new_pkgname = strdup(val);
        if (!new_pkgname) {
-               char err_buf[256] = { 0, };                             
+               char err_buf[256] = { 0, };
                ErrPrint("Heap: %s\n", strerror_r(errno, err_buf, sizeof(err_buf)));
                return WIDGET_ERROR_OUT_OF_MEMORY;
        }
@@ -368,9 +357,8 @@ static int download_cb(const char *pkgname, const char *val, void *data)
        }
 
        if (val) {
-               if (sscanf(val, "%lf", &value) != 1) {
+               if (sscanf(val, "%lf", &value) != 1)
                        value = (double)WIDGET_ERROR_INVALID_PARAMETER;
-               }
        } else {
                value = (double)WIDGET_ERROR_INVALID_PARAMETER;
        }
@@ -405,9 +393,8 @@ static int progress_cb(const char *pkgname, const char *val, void *data)
        }
 
        if (val) {
-               if (sscanf(val, "%lf", &value) != 1) {
+               if (sscanf(val, "%lf", &value) != 1)
                        value = (double)WIDGET_ERROR_INVALID_PARAMETER;
-               }
        } else {
                value = (double)WIDGET_ERROR_INVALID_PARAMETER;
        }
@@ -423,9 +410,8 @@ static int end_cb(const char *pkgname, const char *val, void *data)
        DbgPrint("[%s] %s\n", pkgname, val);
 
        item = find_item(pkgname);
-       if (!item) {
+       if (!item)
                return WIDGET_ERROR_NOT_EXIST;
-       }
 
        item->status = !strcasecmp(val, "ok") ? PKGMGR_STATUS_END : PKGMGR_STATUS_ERROR;
 
@@ -459,14 +445,13 @@ static int pkgmgr_cb(uid_t target_uid, int req_id, const char *type, const char
        int ret;
 
        for (i = 0; handler[i].key; i++) {
-               if (strcasecmp(key, handler[i].key)) {
+               if (strcasecmp(key, handler[i].key))
                        continue;
-               }
 
                ret = handler[i].func(pkgname, val, data);
                if (ret < 0) {
                        DbgPrint("REQ[%d] pkgname[%s], type[%s], key[%s], val[%s], ret = %d\n",
-                                               req_id, pkgname, type, key, val, ret);
+                                       req_id, pkgname, type, key, val, ret);
                }
        }
 
@@ -475,9 +460,8 @@ static int pkgmgr_cb(uid_t target_uid, int req_id, const char *type, const char
 
 HAPI int add_viewer_pkgmgr_init(void)
 {
-       if (s_info.listen_pc) {
+       if (s_info.listen_pc)
                return WIDGET_ERROR_ALREADY_STARTED;
-       }
 
        s_info.listen_pc = pkgmgr_client_new(PC_LISTENING);
        if (!s_info.listen_pc) {
@@ -498,13 +482,11 @@ HAPI int add_viewer_pkgmgr_fini(void)
        struct event_item *item;
        struct item *ctx;
 
-       if (!s_info.listen_pc) {
+       if (!s_info.listen_pc)
                return WIDGET_ERROR_INVALID_PARAMETER;
-       }
 
-       if (pkgmgr_client_free(s_info.listen_pc) != PKGMGR_R_OK) {
+       if (pkgmgr_client_free(s_info.listen_pc) != PKGMGR_R_OK)
                return WIDGET_ERROR_FAULT;
-       }
 
        s_info.listen_pc = NULL;
 
index fbc9e6d01990a98a15165c13313b9f7293391e1d..6771e482d416ad5601c21c5af32f891b3232e4e9 100644 (file)
@@ -117,9 +117,9 @@ static inline UChar *to_UTF16(const char *src, int *out_len)
        }
        res[len] = (UChar)0;
 
-       if (out_len) {
+       if (out_len)
                *out_len = len;
-       }
+
        return res;
 }
 
@@ -148,9 +148,8 @@ static inline char *to_UTF8(UChar *src, int *out_len)
        }
        res[len] = '\0';
 
-       if (out_len) {
+       if (out_len)
                *out_len = len;
-       }
 
        return res;
 }
@@ -191,9 +190,8 @@ static inline int hangul_to_jamo(const char *index)
                free(ret);
        }
 
-       if (tmp < base || tmp > last) {
+       if (tmp < base || tmp > last)
                return tmp;
-       }
 
        tmp = tmp - base;
        a = tmp / (21 * 28);
@@ -228,13 +226,10 @@ HAPI int add_viewer_ucol_compare_first_letters(const char *name, const char *let
                                //DbgPrint("%d - %d (%s, %s)\n", jamo_name, jamo_letters, name, letters);
                                return -1;
                        }
-
                        return __tolower(jamo_name) - __tolower(jamo_letters);
                }
-
                return jamo_name - jamo_letters;
        }
-
        return add_viewer_ucol_ncompare(name, letters, strlen(letters));
 }
 
@@ -255,12 +250,13 @@ HAPI int add_viewer_ucol_is_alpha(const char *name)
 
 HAPI int add_viewer_ucol_detect_lang(int ch)
 {
-//     int result;
        int lang;
-//     int status;
-//     int size;
+#if 0
+       int result;
+       int status;
+       int size;
+
 
-       /*
        u_strToUpper((UChar *)&ch, 1, (UChar *)&result, -1, NULL, &status);
        if (U_FAILURE(status)) {
                ErrPrint("u_strToLower: %s\n", u_errorName(status));
@@ -272,50 +268,50 @@ HAPI int add_viewer_ucol_detect_lang(int ch)
                ErrPrint("unorm_normalize: %s\n", u_errorName(status));
                return LANG_UNKNOWN;
        }
-       */
+#endif
 
        lang = ublock_getCode(ch);
        switch (lang) {
-               case UBLOCK_HIRAGANA:
-               case UBLOCK_KATAKANA:
-               case UBLOCK_KATAKANA_PHONETIC_EXTENSIONS:
-               case UBLOCK_JAVANESE:
-               case UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS:
-                       lang = LANG_JAPANESS;
-                       break;
-               case UBLOCK_HANGUL_JAMO:
-               case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
-               case UBLOCK_HANGUL_SYLLABLES:
-               case UBLOCK_HANGUL_JAMO_EXTENDED_A:
-               case UBLOCK_HANGUL_JAMO_EXTENDED_B:
-                       lang = LANG_KOREAN;
-                       break;
-               case UBLOCK_BASIC_LATIN:                                                        // = 1, /*[0000]*/
-               case UBLOCK_LATIN_1_SUPPLEMENT:                                 // =2, /*[0080]*/
-               case UBLOCK_LATIN_EXTENDED_A:                                           // =3, /*[0100]*/
-               case UBLOCK_LATIN_EXTENDED_B:                                           // =4, /*[0180]*/
-               case UBLOCK_LATIN_EXTENDED_ADDITIONAL:                  // =38, /*[1E00]*/
-                       lang = LANG_ENGLISH;
-                       break;
-               case UBLOCK_CJK_RADICALS_SUPPLEMENT:                     //=58, /*[2E80]*/
-               case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:                 //=61, /*[3000]*/
-               case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS:  //=68, /*[3200]*/
-               case UBLOCK_CJK_STROKES:                                                         // =130, /*[31C0]*/
-               case UBLOCK_CJK_COMPATIBILITY:                                           // =69, /*[3300]*/
-               case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A: //=70, /*[3400]*/
-               case UBLOCK_CJK_UNIFIED_IDEOGRAPHS:                              //=71, /*[4E00]*/
-               case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS:                //=79, /*[F900]*/
-               case UBLOCK_CJK_COMPATIBILITY_FORMS:                             //=83, /*[FE30]*/
-               case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B :       // =94, /*[20000]*/
-               case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT:         // =95, /*[2F800]*/
-               case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:         // =197, /*[2A700]*/
-               case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:         // =209, /*[2B740]*/
-                       lang = LANG_CHINESS;
-                        break;
-               default:
-                       DbgPrint("Detected unknown: %d\n", lang);
-                       lang = LANG_UNKNOWN;
-                       break;
+       case UBLOCK_HIRAGANA:
+       case UBLOCK_KATAKANA:
+       case UBLOCK_KATAKANA_PHONETIC_EXTENSIONS:
+       case UBLOCK_JAVANESE:
+       case UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS:
+               lang = LANG_JAPANESS;
+               break;
+       case UBLOCK_HANGUL_JAMO:
+       case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
+       case UBLOCK_HANGUL_SYLLABLES:
+       case UBLOCK_HANGUL_JAMO_EXTENDED_A:
+       case UBLOCK_HANGUL_JAMO_EXTENDED_B:
+               lang = LANG_KOREAN;
+               break;
+       case UBLOCK_BASIC_LATIN:// = 1, /*[0000]*/
+       case UBLOCK_LATIN_1_SUPPLEMENT:// =2, /*[0080]*/
+       case UBLOCK_LATIN_EXTENDED_A:// =3, /*[0100]*/
+       case UBLOCK_LATIN_EXTENDED_B:// =4, /*[0180]*/
+       case UBLOCK_LATIN_EXTENDED_ADDITIONAL:// =38, /*[1E00]*/
+               lang = LANG_ENGLISH;
+               break;
+       case UBLOCK_CJK_RADICALS_SUPPLEMENT://=58, /*[2E80]*/
+       case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION://=61, /*[3000]*/
+       case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS://=68, /*[3200]*/
+       case UBLOCK_CJK_STROKES:// =130, /*[31C0]*/
+       case UBLOCK_CJK_COMPATIBILITY:// =69, /*[3300]*/
+       case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A://=70, /*[3400]*/
+       case UBLOCK_CJK_UNIFIED_IDEOGRAPHS://=71, /*[4E00]*/
+       case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS://=79, /*[F900]*/
+       case UBLOCK_CJK_COMPATIBILITY_FORMS://=83, /*[FE30]*/
+       case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B:// =94, /*[20000]*/
+       case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT:// =95, /*[2F800]*/
+       case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:// =197, /*[2A700]*/
+       case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:// =209, /*[2B740]*/
+               lang = LANG_CHINESS;
+               break;
+       default:
+               DbgPrint("Detected unknown: %d\n", lang);
+               lang = LANG_UNKNOWN;
+               break;
        }
 
        return lang;
@@ -369,9 +365,8 @@ HAPI int add_viewer_ucol_case_ncompare(const char *src, const char *dest, int le
        char *_dest;
        int ret;
 
-       if (!src || !dest || len <= 0) {
+       if (!src || !dest || len <= 0)
                return -EINVAL;
-       }
 
        if (!s_info.coll) {
                ErrPrint("Fallback to strncasecmp\n");
@@ -379,9 +374,8 @@ HAPI int add_viewer_ucol_case_ncompare(const char *src, const char *dest, int le
        }
 
        _src = ucol_toupper(src);
-       if (!_src) {
+       if (!_src)
                return -EFAULT;
-       }
 
        _dest = ucol_toupper(dest);
        if (!_dest) {
@@ -405,9 +399,8 @@ HAPI int add_viewer_ucol_ncompare(const char *src, const char *dest, int len)
        int32_t src_len;
        char *tmp;
 
-       if (!src || !dest || len <= 0) {
+       if (!src || !dest || len <= 0)
                return -EINVAL;
-       }
 
        if (!s_info.coll) {
                ErrPrint("Fallback to strcmp\n");
@@ -457,13 +450,12 @@ HAPI int add_viewer_ucol_ncompare(const char *src, const char *dest, int len)
                        src_lang = add_viewer_ucol_detect_lang(*src_uni);
                        dest_lang = add_viewer_ucol_detect_lang(*dest_uni);
 
-                       if (src_lang == LANG_JAPANESS && dest_lang != LANG_JAPANESS) {
+                       if (src_lang == LANG_JAPANESS && dest_lang != LANG_JAPANESS)
                                res = UCOL_LESS;
-                       } else if (src_lang != LANG_JAPANESS && dest_lang == LANG_JAPANESS) {
+                       else if (src_lang != LANG_JAPANESS && dest_lang == LANG_JAPANESS)
                                res = UCOL_GREATER;
-                       } else {
+                       else
                                res = ucol_strcoll(s_info.coll, (UChar *)src_uni, len, (UChar *)dest_uni, len);
-                       }
                }
                break;
        case LANG_KOREAN:
@@ -478,13 +470,12 @@ HAPI int add_viewer_ucol_ncompare(const char *src, const char *dest, int len)
                        src_lang = add_viewer_ucol_detect_lang(*src_uni);
                        dest_lang = add_viewer_ucol_detect_lang(*dest_uni);
 
-                       if (src_lang == LANG_KOREAN && dest_lang != LANG_KOREAN) {
+                       if (src_lang == LANG_KOREAN && dest_lang != LANG_KOREAN)
                                res = UCOL_LESS;
-                       } else if (src_lang != LANG_KOREAN && dest_lang == LANG_KOREAN) {
+                       else if (src_lang != LANG_KOREAN && dest_lang == LANG_KOREAN)
                                res = UCOL_GREATER;
-                       } else {
+                       else
                                res = ucol_strcoll(s_info.coll, (UChar *)src_uni, len, (UChar *)dest_uni, len);
-                       }
                }
                break;
        case LANG_ENGLISH:
@@ -527,9 +518,8 @@ HAPI int add_viewer_ucol_case_compare(const char *src, const char *dest)
        char *_dest;
        int ret;
 
-       if (!src || !dest) {
+       if (!src || !dest)
                return -EINVAL;
-       }
 
        if (!s_info.coll) {
                ErrPrint("Fallback to strcasecmp\n");
@@ -537,9 +527,8 @@ HAPI int add_viewer_ucol_case_compare(const char *src, const char *dest)
        }
 
        _src = ucol_toupper(src);
-       if (!_src) {
+       if (!_src)
                return -EFAULT;
-       }
 
        _dest = ucol_toupper(dest);
        if (!_dest) {
@@ -562,9 +551,8 @@ HAPI int add_viewer_ucol_compare(const char *src, const char *dest)
        int32_t src_len = 0;
        int len;
 
-       if (!src || !dest) {
+       if (!src || !dest)
                return -EINVAL;
-       }
 
        if (!s_info.coll) {
                ErrPrint("Fallback to strcmp\n");
@@ -599,13 +587,12 @@ HAPI int add_viewer_ucol_compare(const char *src, const char *dest)
                        src_lang = add_viewer_ucol_detect_lang(*src_uni);
                        dest_lang = add_viewer_ucol_detect_lang(*dest_uni);
 
-                       if (src_lang == LANG_JAPANESS && dest_lang != LANG_JAPANESS) {
+                       if (src_lang == LANG_JAPANESS && dest_lang != LANG_JAPANESS)
                                res = UCOL_LESS;
-                       } else if (src_lang != LANG_JAPANESS && dest_lang == LANG_JAPANESS) {
+                       else if (src_lang != LANG_JAPANESS && dest_lang == LANG_JAPANESS)
                                res = UCOL_GREATER;
-                       } else {
+                       else
                                res = ucol_strcoll(s_info.coll, (UChar *)src_uni, len, (UChar *)dest_uni, len);
-                       }
                }
                break;
        case LANG_KOREAN:
@@ -620,24 +607,22 @@ HAPI int add_viewer_ucol_compare(const char *src, const char *dest)
                        src_lang = add_viewer_ucol_detect_lang(*src_uni);
                        dest_lang = add_viewer_ucol_detect_lang(*dest_uni);
 
-                       if (src_lang == LANG_KOREAN && dest_lang != LANG_KOREAN) {
+                       if (src_lang == LANG_KOREAN && dest_lang != LANG_KOREAN)
                                res = UCOL_LESS;
-                       } else if (src_lang != LANG_KOREAN && dest_lang == LANG_KOREAN) {
+                       else if (src_lang != LANG_KOREAN && dest_lang == LANG_KOREAN)
                                res = UCOL_GREATER;
-                       } else {
+                       else
                                res = ucol_strcoll(s_info.coll, (UChar *)src_uni, len, (UChar *)dest_uni, len);
-                       }
                }
                break;
        case LANG_ENGLISH:
        default:
-               if (__isalpha(*src_uni) && !__isalpha(*dest_uni)) {
+               if (__isalpha(*src_uni) && !__isalpha(*dest_uni))
                        res = UCOL_LESS;
-               } else if (!__isalpha(*src_uni) && __isalpha(*dest_uni)) {
+               else if (!__isalpha(*src_uni) && __isalpha(*dest_uni))
                        res = UCOL_GREATER;
-               } else {
+               else
                        res = ucol_strcoll(s_info.coll, (UChar *)src_uni, len, (UChar *)dest_uni, len);
-               }
        }
 
        free(src_uni);
@@ -648,11 +633,10 @@ HAPI int add_viewer_ucol_compare(const char *src, const char *dest)
                return -1;
 
        case UCOL_EQUAL:
-               if (src_len > dest_len) {
+               if (src_len > dest_len)
                        return 1;
-               } else if (src_len == dest_len) {
+               else if (src_len == dest_len)
                        return 0;
-               }
 
                return -1;
 
@@ -675,16 +659,14 @@ HAPI int add_viewer_ucol_case_search(const char *haystack, const char *needle)
        int idx;
        int ret;
 
-       if (!haystack || !needle) {
+       if (!haystack || !needle)
                return -EINVAL;
-       }
 
        if (!s_info.coll) {
                ErrPrint("Fallback to strcasestr\n");
                ptr = strcasestr(haystack, needle);
-               if (!ptr) {
+               if (!ptr)
                        return -ENOENT;
-               }
 
                return (int)(ptr - haystack);
        }
@@ -739,33 +721,29 @@ HAPI int add_viewer_ucol_search(const char *haystack, const char *needle)
        int idx;
        int needle_len;
 
-       if (!haystack || !needle) {
+       if (!haystack || !needle)
                return -EINVAL;
-       }
 
        if (!s_info.coll) {
                ErrPrint("Fallback to strstr\n");
                ptr = strstr(haystack, needle);
-               if (!ptr) {
+               if (!ptr)
                        return -ENOENT;
-               }
 
                return (int)(ptr - haystack);
        }
 
        needle_len = strlen(needle);
        len = strlen(haystack) - needle_len;
-       if (len == 0) {
+       if (len == 0)
                return add_viewer_ucol_compare(haystack, needle) == 0 ? 0 : -ENOENT;
-       } else if (len < 0) {
+       else if (len < 0)
                return -ENOENT;
-       }
 
        for (idx = 0; idx < len;) {
                ret = add_viewer_ucol_ncompare(haystack + idx, needle, needle_len);
-               if (ret == 0) {
+               if (ret == 0)
                        return idx;
-               }
 
                idx += add_viewer_util_get_utf8_len(haystack[idx]);
        }
index 20cd8428eea728cb6afb772ced3050c7214838ad..5c6ad8ffd14542c869f3e87be4d0d6ed9825df65 100755 (executable)
@@ -98,8 +98,8 @@ HAPI int add_viewer_util_fini(void)
 
 static void response_callback(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
 {
-        struct result_data *res_data = user_data;
-        char *content_info = NULL;
+       struct result_data *res_data = user_data;
+       char *content_info = NULL;
 
        if (s_info.setup) {
                free(s_info.setup);
@@ -112,14 +112,14 @@ static void response_callback(app_control_h request, app_control_h reply, app_co
                return;
        }
 
-        app_control_get_extra_data(reply, EXTRA_KEY_CONTENT_INFO , &content_info);
+       app_control_get_extra_data(reply, EXTRA_KEY_CONTENT_INFO , &content_info);
 
        /**
         * \TODO
         * Use this content_info to add a new widget
         */
 
-        free(res_data);
+       free(res_data);
 
        /**
         * If the box is successfully added, do we need to terminate this?
@@ -178,14 +178,13 @@ HAPI int add_viewer_util_add_to_home(struct add_viewer_package *package, int siz
 
                ret = app_control_send_launch_request(service, response_callback, res_data);
 
+               free(res_data);
                app_control_destroy(service);
 
-               if (ret != APP_CONTROL_ERROR_NONE) {
-                       free(res_data);
+               if (ret != APP_CONTROL_ERROR_NONE)
                        free(setup);
-               } else {
+               else
                        s_info.setup = setup;
-               }
        } else {
                /**
                 * \TODO
@@ -301,7 +300,7 @@ HAPI char *add_viewer_util_highlight_keyword(const char *name, const char *filte
                                        s_info.matched_color.b,
                                        s_info.matched_color.a,
                                        tmp
-                       );
+                                       );
                        free(tmp);
                        name += filter_len;
                } else {
@@ -321,21 +320,20 @@ HAPI char *add_viewer_util_highlight_keyword(const char *name, const char *filte
 HAPI int add_viewer_util_get_utf8_len(char ch)
 {
        int idx_len;
-       if ((ch & 0x80) == 0x00) {
+       if ((ch & 0x80) == 0x00)
                idx_len = 1;
-       } else if ((ch & 0xE0) == 0xC0) {
+       else if ((ch & 0xE0) == 0xC0)
                idx_len = 2;
-       } else if ((ch & 0xF0) == 0xE0) {
+       else if ((ch & 0xF0) == 0xE0)
                idx_len = 3;
-       } else if ((ch & 0xFC) == 0xF8) {
+       else if ((ch & 0xFC) == 0xF8)
                idx_len = 4;
-       } else if ((ch & 0xFE) == 0xFC) {
+       else if ((ch & 0xFE) == 0xFC)
                idx_len = 5;
-       } else if ((ch & 0xFF) == 0xFE) {
+       else if ((ch & 0xFF) == 0xFE)
                idx_len = 6;
-       } else {
+       else
                idx_len = 1;
-       }
 
        return idx_len;
 }
index d600910c09ec17cbfc7af42953b5b89981b7d871..8e48ffa2bb8602555e8fe0ab896dad1464cb4023 100755 (executable)
@@ -44,9 +44,8 @@ bool animator_is_ongoing(void)
 
 void animator_start(void(*stop_cb)(void))
 {
-       if (s_info.is_ongoing) {
+       if (s_info.is_ongoing)
                animator_stop();
-       }
 
        s_info.is_ongoing = true;
        s_info.stop_cb = stop_cb;
@@ -90,9 +89,8 @@ static Eina_Bool __animation_time_over(void *data)
 
 static void __animation_stop(void)
 {
-       if (s_info.stop_cb != NULL) {
+       if (s_info.stop_cb != NULL)
                (*s_info.stop_cb)();
-       }
 
        s_info.is_ongoing = false;
        s_info.stop_cb = NULL;
index 92fecda9cb7175f0e612493493e346c522462edd..8509b88bdde5e8db32c64c1c8d3bbbaf8d43ad74 100755 (executable)
@@ -109,8 +109,7 @@ void apps_callback_manager_execute_cb(apps_callback_t *cb_stack, void *data)
        }
 
        for (idx = 0; idx < cb_stack->cb_count; idx++) {
-               if (cb_stack->cb_list[idx] != NULL) {
+               if (cb_stack->cb_list[idx] != NULL)
                        (*cb_stack->cb_list[idx])(data);
-               }
        }
 }
index df8f3ee89b9fcb0c19d2eb0a6bb3d7f12eae27d5..754571baef4a8108699c4aa94da27c68e18b3aa6 100755 (executable)
@@ -141,16 +141,16 @@ void apps_fini(void)
 
 void apps_resume(void)
 {
-       /*if (s_info.current_state != NULL) {
+       /*if (s_info.current_state != NULL)
                (*s_info.current_state->step_in)();
-       }*/
+       */
 }
 
 void apps_pause(void)
 {
-       /*if (s_info.current_state != NULL) {
+       /*if (s_info.current_state != NULL)
                (*s_info.current_state->step_out)();
-       }*/
+       */
 }
 
 void apps_show(void)
@@ -183,18 +183,16 @@ void apps_hide(void)
 
 void apps_get_access_object_list(Eina_List **list)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->get_access_object_list)(list);
-       }
 }
 
 void __apps_control_manager_set_state(APPS_STATE *state)
 {
        s_info.prev_state = s_info.current_state;
 
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->step_out)((void *) state);
-       }
 
        s_info.current_state = state;
 
@@ -287,28 +285,24 @@ static void __view_focused_cb(void *data, Evas_Object *obj, void *event_info)
 {
        _D("apps view is focused");
 
-       if (apps_key_handler_register_back_key_cb(__back_key_cb) == false) {
+       if (apps_key_handler_register_back_key_cb(__back_key_cb) == false)
                _E("back key cb is not registered");
-       }
 
-       if (apps_key_handler_register_home_key_cb(__home_key_cb) == false) {
+       if (apps_key_handler_register_home_key_cb(__home_key_cb) == false)
                _E("home key cb is not registered");
-       }
 
        apps_rotary_event_handler_activated_set(EINA_TRUE);
 
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->resume_cb)();
-       }
 }
 
 static void __view_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
 {
        _D("apps view is unfocused");
 
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->pause_cb)();
-       }
 
        apps_key_handler_deregister_back_key_cb(__back_key_cb);
        apps_key_handler_deregister_home_key_cb(__home_key_cb);
@@ -333,44 +327,38 @@ static void __add_wallpaper_changed_cb(void)
 
 static void __back_key_cb(void *data)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->back_key_cb)();
-       }
 }
 
 static void __home_key_cb(void *data)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->home_key_cb)();
-       }
 }
 
 static void __cw_cb(void *data)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->cw_rotation_cb)();
-       }
 }
 
 static void __ccw_cb(void *data)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->ccw_rotation_cb)();
-       }
 }
 
 static void __app_data_changed_cb(void *data)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->app_data_changed_cb)();
-       }
 }
 
 static void __badge_changed_cb(unsigned int action, const char *pkgname, unsigned int count, void *data)
 {
-       if (s_info.current_state != NULL) {
+       if (s_info.current_state != NULL)
                (*s_info.current_state->app_badge_changed_cb)();
-       }
 }
 
 static void __register_badge_changed_cb(void)
@@ -378,9 +366,8 @@ static void __register_badge_changed_cb(void)
        int ret = BADGE_ERROR_NONE;
        ret = badge_register_changed_cb(__badge_changed_cb, NULL);
 
-       if (ret != BADGE_ERROR_NONE) {
+       if (ret != BADGE_ERROR_NONE)
                _E("badge_register_changed_cb failed [%d]", ret);
-       }
 }
 
 static void __deregister_badge_changed_cb(void)
@@ -388,9 +375,8 @@ static void __deregister_badge_changed_cb(void)
        int ret = BADGE_ERROR_NONE;
        ret = badge_unregister_changed_cb(__badge_changed_cb);
 
-       if (ret != BADGE_ERROR_NONE) {
+       if (ret != BADGE_ERROR_NONE)
                _E("badge_unregister_changed_cb failed [%d]", ret);
-       }
 }
 
 #include "test.h"
index 8d633ced8d2a26f5a0c588a4f3f1f247a214d52d..1f75673fe249d7bf08d4e62c2a15e0cdd4f7f94c 100755 (executable)
@@ -21,7 +21,7 @@
 
 void apps_data_app_info_free_item(APP_INFO *item)
 {
-       if(item == NULL) {
+       if (item == NULL) {
                _D("item is already null");
                return ;
        }
index 2c688c82e605c50edfc716654812d8b87987c90c..d23a0ebc250a739128814a11995b0567d301f929 100755 (executable)
@@ -46,35 +46,35 @@ enum {
 };
 
 #define CREATE_APPS_ICON_TABLE "create table if not exists apps_icon(\
-               id INTEGER PRIMARY KEY AUTOINCREMENT,\
-               appId           TEXT,\
-               pkgId           TEXT,\
-               label           TEXT,\
-               iconPath        TEXT,\
-               iconIndex       INTEGER);"
+       id INTEGER PRIMARY KEY AUTOINCREMENT,\
+appId          TEXT,\
+pkgId          TEXT,\
+label          TEXT,\
+iconPath       TEXT,\
+iconIndex      INTEGER);"
 
 #define CREATE_APPS_DATA_TABLE "create table if not exists apps_data(\
-               id INTEGER PRIMARY KEY AUTOINCREMENT,\
-               key             TEXT,\
-               value   TEXT);"
+       id INTEGER PRIMARY KEY AUTOINCREMENT,\
+key            TEXT,\
+value  TEXT);"
 
 #define UPDATE_APPS_ICON_TABLE "UPDATE apps_icon set \
-               appId='%s',\
-               pkgId='%s',\
-               label='%s',\
-               iconPath='%s',\
-               iconIndex=%d WHERE id = %d"
+       appId='%s',\
+pkgId='%s',\
+label='%s',\
+iconPath='%s',\
+iconIndex=%d WHERE id = %d"
 
 #define UPDATE_APPS_DATA_TABLE "UPDATE apps_data set \
-               value='%s' WHERE key = '%s'"
+       value='%s' WHERE key = '%s'"
 
 #define INSERT_APPS_ICON_TABLE "INSERT into apps_icon \
-               (appId, pkgId, label, iconPath, iconIndex)\
-               VALUES('%s','%s','%s','%s',%d)"
+       (appId, pkgId, label, iconPath, iconIndex)\
+VALUES('%s','%s','%s','%s',%d)"
 
 #define INSERT_APPS_DATA_TABLE "INSERT into apps_data \
-               (key, value)\
-               VALUES('%s','%s')"
+       (key, value)\
+VALUES('%s','%s')"
 
 #define SELECT_ITEM_ICON "SELECT * FROM apps_icon;"
 #define SELECT_ITEM_DATA "SELECT * FROM apps_data WHERE key = '%s';"
@@ -110,9 +110,8 @@ bool apps_data_db_icon_update(APP_INFO *item)
 {
        char query[QUERY_MAXLEN];
        sqlite3_stmt *stmt;
-       if (!__open_db_connector()) {
+       if (!__open_db_connector())
                return false;
-       }
 
        snprintf(query, QUERY_MAXLEN, UPDATE_APPS_ICON_TABLE,
                        item->app_id,
@@ -140,9 +139,8 @@ int apps_data_db_icon_insert(APP_INFO *item)
        int id = INVALID_VALUE;
        char query[QUERY_MAXLEN];
        sqlite3_stmt *stmt;
-       if (!__open_db_connector()) {
+       if (!__open_db_connector())
                return INVALID_VALUE;
-       }
 
        snprintf(query, QUERY_MAXLEN, INSERT_APPS_ICON_TABLE,
                        item->app_id,
@@ -332,7 +330,7 @@ static bool __create_db_file(void)
                return false;
        }
        ret = sqlite3_exec(s_info.db_connector, "PRAGMA journal_mode = PERSIST",
-               NULL, NULL, &errMsg);
+                       NULL, NULL, &errMsg);
        if (ret != SQLITE_OK) {
                _E("SQL error(%d) : %s", ret, errMsg);
                sqlite3_free(errMsg);
@@ -383,9 +381,8 @@ static bool __update_data_value(char *key, char *value)
 {
        char query[QUERY_MAXLEN];
        sqlite3_stmt *stmt;
-       if (!__open_db_connector()) {
+       if (!__open_db_connector())
                return false;
-       }
 
        snprintf(query, QUERY_MAXLEN, UPDATE_APPS_DATA_TABLE, value, key);
        int ret = sqlite3_prepare(s_info.db_connector, query, QUERY_MAXLEN , &stmt, NULL);
@@ -407,9 +404,8 @@ static int __insert_data_value(char *key, char *value)
        int idx = INVALID_VALUE;
        char query[QUERY_MAXLEN];
        sqlite3_stmt *stmt;
-       if (!__open_db_connector()) {
+       if (!__open_db_connector())
                return INVALID_VALUE;
-       }
 
        snprintf(query, QUERY_MAXLEN, INSERT_APPS_DATA_TABLE, key, value);
 
index c4496692241d0b49d907b842cbe6e592be4ccb4d..c88696471ae9e30998da8c9c6ac56b11d62d80ce 100755 (executable)
@@ -143,9 +143,8 @@ void apps_data_delete_appinfo_by_pkg_id(const char *pkg_id)
        }
 
        EINA_LIST_FOREACH(s_info.app_list, find_list, item) {
-               if (!strcmp(pkg_id, item->pkg_id)){
-                       delete_list = eina_list_append(delete_list,item);
-               }
+               if (!strcmp(pkg_id, item->pkg_id))
+                       delete_list = eina_list_append(delete_list, item);
        }
 
        find_list = NULL;
@@ -164,16 +163,14 @@ int apps_data_get_focus_pos(void)
 {
        int idx = 0;
        char *value = apps_data_db_get_data(KEY_FOCUS_POS);
-       if (value == NULL) {
+       if (value == NULL)
                goto __init_value;
-       }
 
        idx = atoi(value);
        free(value);
 
-       if (idx < 0) {
+       if (idx < 0)
                goto __init_value;
-       }
 
        return idx;
 
@@ -194,15 +191,14 @@ int apps_data_get_focus_page(void)
 {
        int idx = 0;
        char *value = apps_data_db_get_data(KEY_FOCUS_PAGE);
-       if (value == NULL) {
+       if (value == NULL)
                goto __init_value;
-       }
+
        idx = atoi(value);
        free(value);
 
-       if (idx < 0) {
+       if (idx < 0)
                goto __init_value;
-       }
 
        return idx;
 __init_value:
@@ -301,9 +297,8 @@ static void __add_data_fixed_index(Eina_List *list)
                EINA_LIST_FOREACH(s_info.app_list, list_j, item_j) {
                        if (!strcmp(item_i->app_id, item_j->app_id)) {
                                item_j->primary_index = item_i->primary_index;
-                               if (top < 2047) {
+                               if (top < 2047)
                                        stack[++top] = item_j->primary_index;
-                               }
                                break;
                        }
                }
@@ -342,11 +337,10 @@ static void __sort_app_data(void)
        primary_list = __rearrange_index(primary_list);
 
        EINA_LIST_FOREACH(s_info.app_list, find_list, find_item) {
-               if (find_item->primary_index == INVALID_VALUE) {
+               if (find_item->primary_index == INVALID_VALUE)
                        normal_list = eina_list_append(normal_list, find_item);
-               } else {
+               else
                        primary_list = eina_list_append(primary_list, find_item);
-               }
        }
        normal_count = eina_list_count(normal_list);
        primary_count = eina_list_count(primary_list);
@@ -394,9 +388,8 @@ static int __compare_app_data(const void *a, const void *b)
        APP_INFO *item2 = (APP_INFO *)b;
 
        if (item1->primary_index == item2->primary_index) {
-               if (item1->index == item2->index) {
+               if (item1->index == item2->index)
                        return strcmp(item1->label, item2->label);
-               }
 
                return item1->index < item2->index ? -1 : 1;
        }
index e9b88e4738700892e7b6e45757dbc5a9639d2a21..82114036a23ccd76e963f2b4963acd1b62dbb779 100755 (executable)
@@ -30,8 +30,8 @@ static package_manager_h package_manager_handle = NULL;
 
 #if APPS_TEST
 static char test_icon_label[17][30] = { "alarm", "apps", "atntmessages", "buddy", "recent", "calculator",
-               "contacts", "email", "findmycar", "findmydevice", "gallery", "gallery_delta",
-               "phone", "shealth", "timer", "traffic", "voicememo" };
+       "contacts", "email", "findmycar", "findmydevice", "gallery", "gallery_delta",
+       "phone", "shealth", "timer", "traffic", "voicememo" };
 static void __test_fill_icon(APP_INFO **item, int idx);
 #endif
 
@@ -242,9 +242,9 @@ static bool __get_app_info_from_package(package_info_app_component_type_e comp_t
                return false;
        }
 
-       if (__fill_appinfo(app_info, &item)) {
+       if (__fill_appinfo(app_info, &item))
                apps_data_insert_appinfo(item);
-       }
+
        app_info_destroy(app_info);
 
        return true;
@@ -254,9 +254,8 @@ static bool __get_appinfo_from_app_handle(app_info_h app_handle, void *data)
 {
        Eina_List **list = (Eina_List **)data;
        APP_INFO *item = NULL;
-       if (__fill_appinfo(app_handle, &item)) {
+       if (__fill_appinfo(app_handle, &item))
                *list = eina_list_append(*list, item);
-       }
 
        return true;
 }
@@ -311,9 +310,8 @@ static bool __fill_appinfo(app_info_h app_handle, APP_INFO **item)
        }
 
        if (new_item->icon_path == NULL || ecore_file_can_read(new_item->icon_path) == EINA_FALSE) {
-               if (new_item->icon_path != NULL) {
+               if (new_item->icon_path != NULL)
                        free(new_item->icon_path);
-               }
 
                new_item->icon_path = (char *)malloc(FILE_PATH_MAX * sizeof(char));
                if (new_item->icon_path == NULL) {
index 23bb9ae9e4f5a254e91bd1f2ae6e7c0b1d287aeb..1557a889de28de69cafdf5daa8499afd5698076f 100755 (executable)
@@ -73,30 +73,28 @@ Eina_List *apps_data_xml_get_data_list(void)
                                return NULL;
                        }
                        memset(item, 0, sizeof(APP_INFO));
-               } else if(dep == 1 && node_type == 15) {
+               } else if (dep == 1 && node_type == 15) {
                        if (item != NULL) {
                                list = eina_list_append(list, item);
                                item = NULL;
                        }
-               } else if (dep == 2 && node_type == 1 ) {
-                       if (strcmp(name, "app_id") == 0) {
+               } else if (dep == 2 && node_type == 1) {
+                       if (strcmp(name, "app_id") == 0)
                                data_type = _APPS_XML_APP_ID;
-                       } else if (strcmp(name, "position") == 0) {
+                       else if (strcmp(name, "position") == 0)
                                data_type = _APPS_XML_POSITION;
-                       } else {
+                       else
                                data_type = _APPS_XML_INVALID;
-                       }
                } else if (dep == 3 && node_type == 3) {
-                       if (data_type == _APPS_XML_APP_ID) {
+                       if (data_type == _APPS_XML_APP_ID)
                                item->app_id = strdup(value);
-                       } else if(data_type == _APPS_XML_POSITION) {
+                       else if (data_type == _APPS_XML_POSITION)
                                item->primary_index = atoi(value);
-                       }
                }
        }
-       if (item != NULL) {
+       if (item != NULL)
                apps_data_app_info_free_item(item);
-       }
+
        xmlFreeTextReader(reader);
 
        return list;
index f84f511942d09d7c84bd8002dcff42cabb9f6fda..3d1981ea66c4c17ec8cac9d551160679b8cdbfc3 100755 (executable)
@@ -36,23 +36,23 @@ enum {
 };
 
 #define CREATE_APPS_DB_TABLE "create table if not exists apps(\
-               id INTEGER PRIMARY KEY AUTOINCREMENT,\
-               appId           TEXT,\
-               pkgId           TEXT,\
-               label           TEXT,\
-               iconPath        TEXT,\
-               position        TEXT);"
+       id INTEGER PRIMARY KEY AUTOINCREMENT,\
+appId          TEXT,\
+pkgId          TEXT,\
+label          TEXT,\
+iconPath       TEXT,\
+position       TEXT);"
 
 #define UPDATE_APPS_DB_TABLE "UPDATE apps set \
-               appId='%s',\
-               pkgId='%s',\
-               label='%s',\
-               iconPath='%s,\
-               position=%d' WHERE id = %d"
+       appId='%s',\
+pkgId='%s',\
+label='%s',\
+iconPath='%s,\
+position=%d' WHERE id = %d"
 
 #define INSERT_APPS_DB_TABLE "INSERT into apps \
-               (appId, pkgId, label, iconPath, position)\
-               VALUES('%s','%s','%s','%s',%d)"
+       (appId, pkgId, label, iconPath, position)\
+VALUES('%s','%s','%s','%s',%d)"
 
 #define SELECT_ITEM "SELECT * FROM apps;"
 
@@ -76,7 +76,7 @@ bool apps_db_create(void)
                return false;
        }
        ret = sqlite3_exec(apps_db, "PRAGMA journal_mode = PERSIST",
-               NULL, NULL, &errMsg);
+                       NULL, NULL, &errMsg);
        if (ret != SQLITE_OK) {
                _APPS_E("SQL error(%d) : %s", ret, errMsg);
                sqlite3_free(errMsg);
index 1a358f23ca3a70e33a69a9f51cded9c3bf1d03bb..9e6d3bbdc9f2bb837c9abc0b3b34e4e56fa39e2e 100755 (executable)
@@ -127,13 +127,11 @@ static Eina_Bool __key_release_cb(void *data, int type, void *event)
 
        _D("Key(%s) released %d", ev->keyname, s_info.pressed);
 
-       if (s_info.pressed == false) {
+       if (s_info.pressed == false)
                return ECORE_CALLBACK_PASS_ON;
-       }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK))
                __back_key();
-       }
 
        s_info.pressed = false;
 
index 613011a47ecbd271bdb7be416bae73b795fa6fd0..78dfff649ed7fa016b8dd2f03e3aeb5867f83bff 100755 (executable)
@@ -111,11 +111,10 @@ static Eina_Bool __rotation_cb(void *data, Evas_Object *obj, Eext_Rotary_Event_I
                return ECORE_CALLBACK_PASS_ON;
        }
 
-       if (rotary_info->direction == EEXT_ROTARY_DIRECTION_CLOCKWISE) {
+       if (rotary_info->direction == EEXT_ROTARY_DIRECTION_CLOCKWISE)
                apps_callback_manager_execute_cb(s_info.cw_cb_stack, NULL);
-       } else {
+       else
                apps_callback_manager_execute_cb(s_info.ccw_cb_stack, NULL);
-       }
 
        return ECORE_CALLBACK_PASS_ON;
 }
index 1d1c1e4c762366403f4660d11ad5a054f0099308..a41d32093fa2a60f9955128032a8f4486c00b862 100755 (executable)
@@ -53,7 +53,7 @@ static void __dummy_swipe_right_cb(void) { _D("do nothing"); }
 APPS_STATE *__apps_state_new(void)
 {
        APPS_STATE *state = (APPS_STATE *)malloc(sizeof(APPS_STATE));
-       if(state == NULL) {
+       if (state == NULL) {
                _E("failed to malloc");
                return NULL;
        }
index 8b99c5ddba58717ccec5e0866c13fb6fbbe3e2e8..133c8c4e450eba02f0e901a09eef5ea9c83effb6 100755 (executable)
@@ -120,9 +120,8 @@ static void __step_out(void *next_state)
 {
        _D("%s", __func__);
 
-       if (s_info.popup != NULL) {
+       if (s_info.popup != NULL)
                __uninstall_cancel_cb(NULL, NULL, NULL);
-       }
 
        APPS_STATE *reorder_state = __apps_control_manager_get_reorder_state();
 
@@ -138,9 +137,8 @@ static void __step_out(void *next_state)
 
 static void __pause_cb(void)
 {
-       if (s_info.popup != NULL) {
+       if (s_info.popup != NULL)
                __uninstall_cancel_cb(NULL, NULL, NULL);
-       }
 
        __set_state_normal();
 }
@@ -157,18 +155,16 @@ static void __back_key_cb(void)
 
 static void __turn_next_page(void)
 {
-       if (s_info.popup != NULL) {
+       if (s_info.popup != NULL)
                return ;
-       }
 
        apps_view_turn_next_page();
 }
 
 static void __turn_prev_page(void)
 {
-       if (s_info.popup != NULL) {
+       if (s_info.popup != NULL)
                return ;
-       }
 
        apps_view_turn_prev_page();
 }
@@ -177,9 +173,8 @@ static void __popup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
 {
        _D("%s", __func__);
 
-       if (obj == NULL) {
+       if (obj == NULL)
                return;
-       }
 
        evas_object_del(obj);
        obj = NULL;
@@ -192,9 +187,8 @@ static void __progress_popup_dismissed_cb(void *data, Evas_Object *obj, void *ev
 {
        _D("%s", __func__);
 
-       if (obj == NULL) {
+       if (obj == NULL)
                return;
-       }
 
        evas_object_del(obj);
        obj = NULL;
@@ -207,9 +201,8 @@ static void __uninstall_cancel_cb(void *data, Evas_Object *obj, void *event_info
 {
        _D("%s", __func__);
 
-       if (s_info.popup == NULL) {
+       if (s_info.popup == NULL)
                return;
-       }
 
        elm_popup_dismiss(s_info.popup);
        s_info.popup = NULL;
@@ -252,9 +245,8 @@ END:
 
 static void __uninstall_app(APP_INFO *app_info, int pos)
 {
-       if (app_info->is_removable) {
+       if (app_info->is_removable)
                __open_uninstall_popup(app_info->app_id, app_info->pkg_id, app_info->icon_path);
-       }
 }
 
 static void __open_uninstall_popup(char *app_id, char *pkg_id, char *icon_path)
index 6049f4c15b71096216b35871aae3a9833d022613..838c37e711209c71a3a51754e31f7b41ba18f6a2 100755 (executable)
@@ -290,11 +290,10 @@ static void __execute_focus_icon(APPS_ICON_INFO *icon_info, int pos)
                __turn_next_page();
        } else if (icon_info->icon_type == ICON_TYPE_PREV) {
                __turn_prev_page();
-       } else if (icon_info->icon_type == ICON_TYPE_APP){
+       } else if (icon_info->icon_type == ICON_TYPE_APP) {
                APP_INFO *info = apps_data_get_nth_app_info(icon_info->icon_idx);
-               if (info != NULL) {
+               if (info != NULL)
                        __execute_app(info, pos);
-               }
        }
 }
 
@@ -304,9 +303,7 @@ static void __execute_auto_open_app(APPS_ICON_INFO *icon_info, int pos)
        vconf_get_int(VCONFKEY_SETAPPL_AUTO_OPEN_APPS, &is_open);
 
        if (is_open)
-       {
                __execute_focus_icon(icon_info, pos);
-       }
 }
 
 static void __set_state_edit(void)
index a525929435402cc9084410eb2ebfe9eca1b184a0..dd79ea0e4c669ec49d4db4424fa299f46137f220 100755 (executable)
@@ -70,13 +70,11 @@ ERROR_E apps_view_init(void)
 {
        _D("%s", __func__);
 
-       if (__create_ui_object() != ERROR_NONE) {
+       if (__create_ui_object() != ERROR_NONE)
                goto __fail;
-       }
 
-       if (apps_view_circle_touch_handler_init() != ERROR_NONE) {
+       if (apps_view_circle_touch_handler_init() != ERROR_NONE)
                goto __fail;
-       }
 
        s_info.show_complete_cb_stack = apps_callback_manager_new();
        if (s_info.show_complete_cb_stack == NULL) {
@@ -88,7 +86,7 @@ ERROR_E apps_view_init(void)
 
        return ERROR_NONE;
 
-__fail :
+__fail:
        apps_view_circle_touch_handler_fini();
        __destroy_ui_object();
        return ERROR_FAILED;
@@ -242,9 +240,8 @@ bool apps_view_register_show_complete_cb(void(*show_complete_cb)(void *data))
        bool ret = false;
 
        ret = apps_callback_manager_register_cb(s_info.show_complete_cb_stack, show_complete_cb);
-       if (ret == false) {
+       if (ret == false)
                _E("Failed to register show complete cb");
-       }
 
        return ret;
 }
index 0ede5ae630fc553e5fecc0156ce90d30debe6bbc..f9952489d491a46f1fddbfcd6984ea7e8b9d3a53 100755 (executable)
@@ -47,11 +47,11 @@ static struct __view_circle_s {
 };
 
 double ICON_ANGLE[APPS_ICON_COUNT_PER_PAGE] = {
-               APPS_ICON_BASE_ANGLE * 1, APPS_ICON_BASE_ANGLE * 2,
-               APPS_ICON_BASE_ANGLE * 3, APPS_ICON_BASE_ANGLE * 4,
-               APPS_ICON_BASE_ANGLE * 5, APPS_ICON_BASE_ANGLE * 6,
-               APPS_ICON_BASE_ANGLE * 7, APPS_ICON_BASE_ANGLE * 8,
-               APPS_ICON_BASE_ANGLE * 9, APPS_ICON_BASE_ANGLE * 10,
+       APPS_ICON_BASE_ANGLE * 1, APPS_ICON_BASE_ANGLE * 2,
+       APPS_ICON_BASE_ANGLE * 3, APPS_ICON_BASE_ANGLE * 4,
+       APPS_ICON_BASE_ANGLE * 5, APPS_ICON_BASE_ANGLE * 6,
+       APPS_ICON_BASE_ANGLE * 7, APPS_ICON_BASE_ANGLE * 8,
+       APPS_ICON_BASE_ANGLE * 9, APPS_ICON_BASE_ANGLE * 10,
 };
 
 #define BASE_LAYOUT_EDJE EDJE_DIR"/circle/apps_base_layout_circle.edj"
@@ -170,8 +170,8 @@ void apps_view_move_focus_next(void)
        } else {
                if (item.icon_idx == apps_data_get_list_count() - 1) {
                        __apps_view_circle_animator_focus_point_bound(
-                                               s_info.focus_point, ICON_ANGLE[pos >= APPS_ICON_COUNT_PER_PAGE ? 0 : pos], CLOCKWISE,
-                                               APPS_FOCUS_POINT_RADIUS, APPS_FOCUS_POINT_W, APPS_FOCUS_POINT_H, APPS_FOCUS_BOUND_TIME, __show_focus_point);
+                                       s_info.focus_point, ICON_ANGLE[pos >= APPS_ICON_COUNT_PER_PAGE ? 0 : pos], CLOCKWISE,
+                                       APPS_FOCUS_POINT_RADIUS, APPS_FOCUS_POINT_W, APPS_FOCUS_POINT_H, APPS_FOCUS_BOUND_TIME, __show_focus_point);
                } else {
                        Eina_List *layout_list = NULL;
                        Eina_List *cur_angle_list = NULL;
@@ -223,8 +223,8 @@ void apps_view_move_focus_prev(void)
        } else {
                if (item.icon_idx == 0) {
                        __apps_view_circle_animator_focus_point_bound(
-                                               s_info.focus_point, ICON_ANGLE[0], COUNT_CLOCKWISE,
-                                               APPS_FOCUS_POINT_RADIUS, APPS_FOCUS_POINT_W, APPS_FOCUS_POINT_H, APPS_FOCUS_BOUND_TIME, __show_focus_point);
+                                       s_info.focus_point, ICON_ANGLE[0], COUNT_CLOCKWISE,
+                                       APPS_FOCUS_POINT_RADIUS, APPS_FOCUS_POINT_W, APPS_FOCUS_POINT_H, APPS_FOCUS_BOUND_TIME, __show_focus_point);
                } else {
                        Eina_List *layout_list = NULL;
                        Eina_List *cur_angle_list = NULL;
@@ -267,9 +267,8 @@ void apps_view_occupy_touch_callback(APPS_VIEW_CALLBACK *callback)
 void apps_view_set_wallpaper_path(const char * path)
 {
        Evas_Object * background = elm_object_part_content_unset(s_info.base_layout, APPS_BACKGROUND);
-       if (background) {
+       if (background)
                evas_object_del(background);
-       }
 
        s_info.background = __create_background(s_info.base_layout, path);
        if (s_info.background == NULL) {
@@ -283,9 +282,8 @@ void apps_view_set_wallpaper_path(const char * path)
 const char * apps_view_get_wallpaper_path(void)
 {
        const char * path = NULL;
-       if (s_info.background) {
+       if (s_info.background)
                elm_image_file_get(s_info.background, &path, NULL);
-       }
 
        return path;
 }
@@ -409,18 +407,16 @@ void __apps_view_circle_set_focus_text_enable(bool is_enable)
 
 void __apps_view_circle_focus_text_press(void)
 {
-       if (s_info.is_enable_focus_text == false) {
+       if (s_info.is_enable_focus_text == false)
                return ;
-       }
 
        __set_focus_dim();
 }
 
 void __apps_view_circle_focus_text_release(void)
 {
-       if (s_info.is_enable_focus_text == false) {
+       if (s_info.is_enable_focus_text == false)
                return ;
-       }
 
        __set_focus_default();
 }
@@ -462,9 +458,8 @@ static Evas_Object *__create_background(Evas_Object *layout, const char * path)
                return NULL;
        }
 
-       if (path == NULL || !ecore_file_can_read(path)) {
+       if (path == NULL || !ecore_file_can_read(path))
                path = util_get_res_file_path(DEFAULT_WALLPAPER_IMAGE_PATH);
-       }
 
        if (elm_image_file_set(background, path, "bg") == EINA_FALSE) {
                _E("Failed to set background image file");
@@ -514,9 +509,8 @@ static void __set_focus_text(char *label)
        elm_object_part_text_set(s_info.base_layout, APPS_FOCUS_TEXT, text);
 
        target_obj = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(s_info.base_layout), APPS_FOCUS_TEXT);
-       if (target_obj) {
+       if (target_obj)
                screen_reader_update_name(target_obj, label);
-       }
 }
 
 static void __move_focus_next(void)
@@ -624,9 +618,8 @@ static void __read_focus_text(void)
        markup_str = buf ? elm_entry_markup_to_utf8(buf) : NULL;
 
        target_obj = (Evas_Object *) edje_object_part_object_get(elm_layout_edje_get(s_info.base_layout), APPS_FOCUS_TEXT);
-       if (target_obj) {
+       if (target_obj)
                screen_reader_read(markup_str, EINA_TRUE);
-       }
 
        free(markup_str);
 }
index f25ed3a9436770a597178630dccc017475aeef08..205719f3525afc5274cd0e124167edf0bd23dc57 100755 (executable)
@@ -186,11 +186,10 @@ static Eina_Bool __focus_point_bound_cb(void *data)
 
        double angle = (APPS_ICON_BASE_ANGLE / 2);
 
-       if (s_info.current_step <= bound_step) {
+       if (s_info.current_step <= bound_step)
                angle = (angle / bound_step) * s_info.current_step;
-       } else if (s_info.current_step > bound_step + stand_step) {
+       else if (s_info.current_step > bound_step + stand_step)
                angle = (angle / bound_step) * (len - s_info.current_step);
-       }
 
        angle = s_info.current_angle + s_info.rotaty_direction * angle;
 
@@ -264,13 +263,11 @@ static void __animator_init(void)
 
 static void __animator_stop(void)
 {
-       if (s_info.show_timer != NULL) {
+       if (s_info.show_timer != NULL)
                ecore_timer_del(s_info.show_timer);
-       }
 
-       if (s_info.complete_cb != NULL) {
+       if (s_info.complete_cb != NULL)
                (*s_info.complete_cb)();
-       }
 
        __animator_init();
 }
index 751d892f1ca6af884a35e09ed3f09f82c1441bef..37a237c55ebc2e9628f9cf44a1376639d9e55c34 100755 (executable)
@@ -224,10 +224,9 @@ void __apps_view_circle_icon_set_focused(APPS_ICON_INFO *info, bool is_focused)
        }
 
        edje = elm_layout_edje_get(info->layout);
-       if (is_focused) {
+       if (is_focused)
                edje_object_signal_emit(edje, SIGNAL_APPS_ICON_FOCUSED, SIGNAL_SOURCE);
-       } else {
+       else
                edje_object_signal_emit(edje, SIGNAL_APPS_ICON_DEFAULT, SIGNAL_SOURCE);
-       }
 }
 
index 5ae8fc9c50e32af78649d31503b715949035b213..ebead838fb9b4fef4c4a572965ebccdbefe828ed 100755 (executable)
@@ -135,9 +135,8 @@ bool apps_view_register_page_changed_cb(void(*page_changed_cb)(void *data))
 {
        bool ret = false;
        ret = apps_callback_manager_register_cb(s_info.page_focus_cb_stack, page_changed_cb);
-       if (ret == false) {
+       if (ret == false)
                _E("Failed to register page changed cb");
-       }
 
        return ret;
 }
@@ -213,13 +212,16 @@ void apps_view_show_delete_button(void)
                        APP_INFO *info = apps_data_get_nth_app_info(s_info.icon_info[pos]->icon_idx);
 
                        if (info->is_removable) {
-                               int button_pos = pos <= APPS_ICON_POS_RIGHT ? APPS_ICON_EDIT_BTN_POSITION_LEFT : APPS_ICON_EDIT_BTN_POSITION_RIGHT;
-                               __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout, APPS_ICON_EDIT_BTN_SHOW, button_pos);
+                               int button_pos = (pos <= APPS_ICON_POS_RIGHT) ? APPS_ICON_EDIT_BTN_POSITION_LEFT : APPS_ICON_EDIT_BTN_POSITION_RIGHT;
+                               __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout,
+                                               APPS_ICON_EDIT_BTN_SHOW, button_pos);
                        } else {
-                               __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout, APPS_ICON_EDIT_BTN_HIDE, 0);
+                               __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout,
+                                               APPS_ICON_EDIT_BTN_HIDE, 0);
                        }
                } else {
-                       __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout, APPS_ICON_EDIT_BTN_HIDE, 0);
+                       __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout,
+                                       APPS_ICON_EDIT_BTN_HIDE, 0);
                }
        }
 }
@@ -228,7 +230,8 @@ void apps_view_hide_delete_button(void)
 {
        int pos = 0;
        for (pos = 0; pos < APPS_ICON_COUNT_PER_PAGE; pos++) {
-               __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout, APPS_ICON_EDIT_BTN_HIDE, 0);
+               __apps_view_circle_icon_set_edit_btn(s_info.icon_info[pos]->layout,
+                               APPS_ICON_EDIT_BTN_HIDE, 0);
        }
 }
 
@@ -280,9 +283,11 @@ void apps_view_show_badge_count(void)
                                int badge_count = __get_badge_count(info->app_id);
                                int badge_position = pos <= APPS_ICON_POS_RIGHT ? APPS_ICON_BADGE_POSITION_LEFT : APPS_ICON_BADGE_POSITION_RIGHT;
                                if (badge_count == 0) {
-                                       __apps_view_circle_icon_set_badge(s_info.icon_info[pos]->layout, APPS_ICON_BADGE_HIDE, 0, 0);
+                                       __apps_view_circle_icon_set_badge(s_info.icon_info[pos]->layout,
+                                                       APPS_ICON_BADGE_HIDE, 0, 0);
                                } else {
-                                       __apps_view_circle_icon_set_badge(s_info.icon_info[pos]->layout, APPS_ICON_BADGE_SHOW, badge_position, badge_count);
+                                       __apps_view_circle_icon_set_badge(s_info.icon_info[pos]->layout,
+                                                       APPS_ICON_BADGE_SHOW, badge_position, badge_count);
                                }
                        }
                } else {
@@ -295,7 +300,8 @@ void apps_view_hide_badge_count(void)
 {
        int pos = 0;
        for (pos = 0; pos < APPS_ICON_COUNT_PER_PAGE; pos++) {
-               __apps_view_circle_icon_set_badge(s_info.icon_info[pos]->layout, APPS_ICON_BADGE_HIDE, 0, 0);
+               __apps_view_circle_icon_set_badge(s_info.icon_info[pos]->layout,
+                               APPS_ICON_BADGE_HIDE, 0, 0);
        }
 }
 
@@ -377,26 +383,23 @@ void __apps_view_circle_icon_show_focus(void)
                apps_data_set_focus_pos(pos);
        }
 
-       for (i = 0; i < s_info.current_icon_count; i++) {
+       for (i = 0; i < s_info.current_icon_count; i++)
                __apps_view_circle_icon_set_focused(s_info.icon_info[i], i == pos);
-       }
 }
 
 void __apps_view_circle_icon_hide_focus(void)
 {
        int i = 0;
-       for (i = 0; i < s_info.current_icon_count; i++) {
+       for (i = 0; i < s_info.current_icon_count; i++)
                __apps_view_circle_icon_set_focused(s_info.icon_info[i], false);
-       }
 }
 
 void __apps_view_circle_icon_bound(APPS_ROTATION rotation)
 {
        _D("%s", __func__);
 
-       if (s_info.page_count == 1) {
+       if (s_info.page_count == 1)
                return ;
-       }
 
        int i = 0;
        int idx = rotation == CLOCKWISE ? 0 : s_info.current_icon_count - 1;
@@ -472,14 +475,12 @@ void __apps_view_circle_icon_page_get(void)
 
        __get_page_icon_idx(current, &from, &to);
 
-       for (i = 0; i < APPS_ICON_COUNT_PER_PAGE; i++) {
+       for (i = 0; i < APPS_ICON_COUNT_PER_PAGE; i++)
                elm_grid_unpack(s_info.grid, s_info.icon_info[i]->layout);
-       }
 
        changed_current = apps_data_get_focus_page();
-       if (current != changed_current) {
+       if (current != changed_current)
                current = changed_current;
-       }
 
        if (current > 0) {
                __apps_view_circle_icon_set_prev_icon(s_info.icon_info[idx]);
@@ -487,11 +488,10 @@ void __apps_view_circle_icon_page_get(void)
        }
 
        for (i = 0; i < to - from + 1; i++) {
-               if (s_info.picked_icon != NULL && s_info.picked_icon->icon_idx == from + i) {
+               if (s_info.picked_icon != NULL && s_info.picked_icon->icon_idx == from + i)
                        __apps_view_circle_icon_set_blank_icon(s_info.icon_info[idx]);
-               } else {
+               else
                        __apps_view_circle_icon_set_app_icon(s_info.icon_info[idx], from + i);
-               }
 
                idx += 1;
        }
@@ -515,9 +515,9 @@ void __apps_view_circle_icon_page_get(void)
                apps_callback_manager_execute_cb(s_info.page_count_cb_stack, &s_info.page_count);
        }
 
-       if (s_info.current_page != current) {
+       if (s_info.current_page != current)
                s_info.current_page = current;
-       }
+
        apps_callback_manager_execute_cb(s_info.page_focus_cb_stack, &s_info.current_page);
 }
 
@@ -717,9 +717,9 @@ void __apps_view_circle_icon_pick_up_cancel(void)
 void __apps_view_circle_icon_drag(int cur_x, int cur_y)
 {
        int x, y;
-       if (s_info.picked_icon == NULL || s_info.picked_icon->layout == NULL) {
+       if (s_info.picked_icon == NULL || s_info.picked_icon->layout == NULL)
                return;
-       }
+
        x = cur_x - (APPS_ICON_W / 2);
        y = cur_y - (APPS_ICON_H / 2) - APPS_ICON_PICKED_MOVE_OFFSET_H;
 
@@ -731,13 +731,13 @@ void __apps_view_circle_icon_drag_hold(int hold_area)
        _D("%s", __func__);
 
        if (s_info.icon_info[hold_area]->icon_type == ICON_TYPE_NEXT) {
-               if (s_info.callback != NULL) {
+               if (s_info.callback != NULL)
                        (*s_info.callback->drag_hold_next)();
-               }
+
        } else if (s_info.icon_info[hold_area]->icon_type == ICON_TYPE_PREV) {
-               if (s_info.callback != NULL) {
+               if (s_info.callback != NULL)
                        (*s_info.callback->drag_hold_prev)();
-               }
+
        } else if (s_info.icon_info[hold_area]->icon_type == ICON_TYPE_APP) {
                __push_icon(hold_area);
        }
@@ -760,11 +760,10 @@ void __apps_view_circle_icon_set_badge(Evas_Object *icon_layout, int visibility,
        char num[128] = { 0, };
        int digit = 0;
 
-       if (count <= 999) {
+       if (count <= 999)
                snprintf(num, sizeof(num), "%d", count);
-       } else {
+       else
                snprintf(num, sizeof(num), "%d+", 999);
-       }
 
        digit = __get_badge_length(count);
 
@@ -884,11 +883,11 @@ static int __get_page_count(void)
        int item_count_per_page = APPS_ICON_COUNT_PER_PAGE;
        int item_count = apps_data_get_list_count();
 
-       while(item_count > item_count_per_page) {
+       while (item_count > item_count_per_page) {
                item_count = item_count - (item_count_per_page - 1);
-               if (item_count_per_page == APPS_ICON_COUNT_PER_PAGE) {
+               if (item_count_per_page == APPS_ICON_COUNT_PER_PAGE)
                        item_count_per_page -= 1;
-               }
+
                page_cnt += 1;
        }
 
@@ -970,7 +969,7 @@ static void __tap_icon(int pos)
        }
 
        app_info = apps_data_get_nth_app_info(icon_info->icon_idx);
-       if(app_info == NULL) {
+       if (app_info == NULL) {
                _E("focus app info is null");
                return ;
        }
@@ -1031,9 +1030,8 @@ static int __get_badge_count(char *app_id)
                _E("badge_get_display error %d", result);
                return 0;
        }
-       if (!to_be_displayed) {
+       if (!to_be_displayed)
                return 0;
-       }
 
        result = badge_get_count(app_id, &badge_count);
        if (result != BADGE_ERROR_NONE) {
@@ -1064,9 +1062,8 @@ static void __icon_drop(void)
        Evas_Object *edje_obj = NULL;
        int blank_pos = INVALID_VALUE;
 
-       if (animator_is_ongoing()) {
+       if (animator_is_ongoing())
                animator_stop();
-       }
 
        edje_obj = elm_layout_edje_get(s_info.picked_icon->layout);
        edje_object_signal_emit(edje_obj, SIGNAL_APPS_ICON_DEFAULT, SIGNAL_SOURCE);
@@ -1104,9 +1101,8 @@ static int __get_blank_position(void)
        int pos = 0;
 
        for (pos = 0; pos < s_info.current_icon_count; pos++) {
-               if (s_info.icon_info[pos]->icon_type == ICON_TYPE_BLANK) {
+               if (s_info.icon_info[pos]->icon_type == ICON_TYPE_BLANK)
                        return pos;
-               }
        }
 
        return INVALID_VALUE;
@@ -1132,7 +1128,8 @@ static void __push_icon(int push_area)
        apps_view_circle_touch_handler_block_event();
 
        if (s_info.callback != NULL) {
-               (*s_info.callback->drag_hold_icon)(s_info.picked_icon->icon_idx, s_info.icon_info[push_area]->icon_idx);
+               (*s_info.callback->drag_hold_icon)(s_info.picked_icon->icon_idx,
+                               s_info.icon_info[push_area]->icon_idx);
        }
        s_info.picked_icon->icon_idx = s_info.icon_info[push_area]->icon_idx;
 
@@ -1140,7 +1137,8 @@ static void __push_icon(int push_area)
                if (picked_icon_idx < s_info.icon_info[push_area]->icon_idx) {
                        __move_icon_group(1, push_area, COUNT_CLOCKWISE, ANIMATION_OPTION_PUSING);
                } else {
-                       __move_icon_group(s_info.current_icon_count - 1, push_area, CLOCKWISE, ANIMATION_OPTION_PUSING);
+                       __move_icon_group(s_info.current_icon_count - 1, push_area, CLOCKWISE,
+                                       ANIMATION_OPTION_PUSING);
                }
        } else if (blank_pos > push_area) {
                evas_object_hide(s_info.icon_info[blank_pos]->layout);
index 709dfb90ed19904101478f586a0f6894c7627cad..db7214b06d8377935efa728865660a4823593496 100755 (executable)
@@ -195,18 +195,16 @@ static void __page_focus_changed_cb(void *data)
                return ;
        }
 
-       if (*focus_unit > APPS_INDICATOR_MAX_COUNT -1) {
+       if (*focus_unit > APPS_INDICATOR_MAX_COUNT -1)
                *focus_unit = APPS_INDICATOR_MAX_COUNT -1;
-       }
 
        _D("focus page is changed [%d -> %d]", s_info.cur_unit, *focus_unit);
 
        for (i = 0; i < s_info.unit_count; i++) {
-               if (i == *focus_unit) {
+               if (i == *focus_unit)
                        evas_object_color_set(s_info.unit[i], INDICATOR_UNIT_FOCUS.r, INDICATOR_UNIT_FOCUS.g, INDICATOR_UNIT_FOCUS.b, INDICATOR_UNIT_FOCUS.a);
-               } else {
+               else
                        evas_object_color_set(s_info.unit[i], INDICATOR_UNIT_UNFOCUS.r, INDICATOR_UNIT_UNFOCUS.g, INDICATOR_UNIT_UNFOCUS.b, INDICATOR_UNIT_UNFOCUS.a);
-               }
        }
 
        s_info.cur_unit = *focus_unit;
@@ -221,9 +219,8 @@ static void __page_count_changed_cb(void *data)
                return ;
        }
 
-       if(*page_cnt > APPS_INDICATOR_MAX_COUNT) {
+       if (*page_cnt > APPS_INDICATOR_MAX_COUNT)
                *page_cnt = APPS_INDICATOR_MAX_COUNT;
-       }
 
        _D("page count is changed [%d -> %d]", s_info.unit_count, *page_cnt);
 
index 3f2b3be17e90e53081d455e9c4d3c59caff5aee5..ccd407ec951f3001647dd80a292149637701546d 100755 (executable)
@@ -166,9 +166,8 @@ int __apps_view_circle_touch_handler_get_tap_hold_area(void)
 {
        int touch_area = 0;
 
-       if (!s_info.long_pressed) {
+       if (!s_info.long_pressed)
                return INVALID_VALUE;
-       }
 
        touch_area = __get_area_index(s_info.down.x, s_info.down.y);
 
@@ -197,11 +196,10 @@ static void __down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        s_info.down.y = s_info.move.y = ev->output.y;
 
        s_info.pressed_area_idx = __get_area_index(ev->output.x, ev->output.y);
-       if (s_info.pressed_area_idx >= ICON_0 && s_info.pressed_area_idx <= ICON_9) {
+       if (s_info.pressed_area_idx >= ICON_0 && s_info.pressed_area_idx <= ICON_9)
                __apps_view_circle_icon_press(s_info.pressed_area_idx);
-       } else if (s_info.pressed_area_idx == TEXT_AREA) {
+       else if (s_info.pressed_area_idx == TEXT_AREA)
                __apps_view_circle_focus_text_press();
-       }
 
        __add_long_press_timer(&s_info.pressed_area_idx);
 }
@@ -209,9 +207,8 @@ static void __down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void __move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
        Evas_Event_Mouse_Move *ev = event_info;
-       if (!s_info.pressed) {
+       if (!s_info.pressed)
                return;
-       }
 
        s_info.move.x = ev->cur.output.x;
        s_info.move.y = ev->cur.output.y;
@@ -239,9 +236,8 @@ static void __up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        Evas_Event_Mouse_Up *ev = event_info;
        int touch_area = __get_area_index(ev->output.x, ev->output.y);
        double move_distance = 0.0;
-       if (!s_info.pressed) {
+       if (!s_info.pressed)
                return;
-       }
 
        s_info.pressed = false;
        __delete_long_press_timer();
@@ -254,11 +250,10 @@ static void __up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        s_info.up.x = ev->output.x;
        s_info.up.y = ev->output.y;
 
-       if (s_info.pressed_area_idx >= ICON_0 && s_info.pressed_area_idx <= ICON_9) {
+       if (s_info.pressed_area_idx >= ICON_0 && s_info.pressed_area_idx <= ICON_9)
                __apps_view_circle_icon_release(s_info.pressed_area_idx);
-       } else if(s_info.pressed_area_idx == TEXT_AREA) {
+       else if (s_info.pressed_area_idx == TEXT_AREA)
                __apps_view_circle_focus_text_release();
-       }
 
        if (s_info.long_pressed) {
                s_info.long_pressed = false;
@@ -268,19 +263,17 @@ static void __up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
        move_distance = __get_distance(s_info.down.x, s_info.up.x, s_info.down.y, s_info.up.y);
        if (touch_area == s_info.pressed_area_idx && move_distance <= APPS_TOUCH_MOVE_MIN_DISTANCE) {
-               if (touch_area == TEXT_AREA) {
+               if (touch_area == TEXT_AREA)
                        __apps_view_circle_tap_focus_text();
-               } else if (touch_area >= ICON_0 && touch_area <= ICON_9) {
+               else if (touch_area >= ICON_0 && touch_area <= ICON_9)
                        __apps_view_circle_tap_icon(touch_area);
-               }
                return ;
        }
 
-       if (s_info.up.x - s_info.down.x > APPS_SWIPE_MIN_DISTANCE) {
+       if (s_info.up.x - s_info.down.x > APPS_SWIPE_MIN_DISTANCE)
                __apps_view_circle_swipe_right();
-       } else if (s_info.down.x - s_info.up.x > APPS_SWIPE_MIN_DISTANCE) {
+       else if (s_info.down.x - s_info.up.x > APPS_SWIPE_MIN_DISTANCE)
                __apps_view_circle_swipe_left();
-       }
 }
 
 static Eina_Bool __long_press_timer_cb(void *data)
@@ -300,13 +293,12 @@ static Eina_Bool __long_press_timer_cb(void *data)
 
        s_info.long_pressed = true;
 
-       if (touch_area == TEXT_AREA) {
+       if (touch_area == TEXT_AREA)
                __apps_view_circle_tap_hold_focus_text();
-       } else if (touch_area == EMPTY_AREA) {
+       else if (touch_area == EMPTY_AREA)
                __apps_view_circle_tap_hold_empty_area();
-       } else if (touch_area >= ICON_0 && touch_area <= ICON_9) {
+       else if (touch_area >= ICON_0 && touch_area <= ICON_9)
                __apps_view_circle_tap_hold_icon(touch_area);
-       }
 
        s_info.long_press_timer = NULL;
        return ECORE_CALLBACK_CANCEL;
@@ -329,9 +321,8 @@ static Eina_Bool __hold_timer_cb(void *data)
 
        _D("drag hold %d", hold_area);
 
-       if (hold_area >= ICON_0 && hold_area <= ICON_9) {
+       if (hold_area >= ICON_0 && hold_area <= ICON_9)
                __apps_view_circle_icon_drag_hold(hold_area);
-       }
 
        return ECORE_CALLBACK_RENEW;
 }
@@ -356,27 +347,23 @@ static int __get_area_index(int x, int y)
        double angle = 0.0;
        double radius = __get_distance(x, WINDOW_CENTER_X, y, WINDOW_CENTER_Y);
 
-       if (radius < APPS_FOCUS_TEXT_RADIUS) {
+       if (radius < APPS_FOCUS_TEXT_RADIUS)
                return TEXT_AREA;
-       }
 
-       if (radius < APPS_EMPTY_AREA_RADIUS) {
+       if (radius < APPS_EMPTY_AREA_RADIUS)
                return EMPTY_AREA;
-       }
 
        touch_angle = atan((double)(WINDOW_CENTER_Y - y) / (WINDOW_CENTER_X - x)) * radian_to_degree;
 
-       if (x >= WINDOW_CENTER_X) {
+       if (x >= WINDOW_CENTER_X)
                touch_angle += 90.0;
-       } else {
+       else
                touch_angle += 270.0;
-       }
 
        angle = area_angle[0];
        for (idx = 1; idx <= APPS_ICON_COUNT_PER_PAGE; idx++) {
-               if (touch_angle >= angle && touch_angle < angle + area_angle[idx]) {
+               if (touch_angle >= angle && touch_angle < angle + area_angle[idx])
                        return idx - 1;
-               }
                angle += area_angle[idx];
        }
 
@@ -388,9 +375,8 @@ static void __add_long_press_timer(void *data)
        __delete_long_press_timer();
 
        s_info.long_press_timer = ecore_timer_add(LONG_PRESS_TIME, __long_press_timer_cb, data);
-       if (s_info.long_press_timer == NULL) {
+       if (s_info.long_press_timer == NULL)
                _E("Failed to add page long press timer");
-       }
 }
 
 static void __delete_long_press_timer(void)
@@ -406,9 +392,8 @@ static void __add_hold_timer(void *data)
        __delete_hold_timer();
 
        s_info.hold_timer = ecore_timer_add(LONG_PRESS_TIME, __hold_timer_cb, data);
-       if (s_info.hold_timer == NULL) {
+       if (s_info.hold_timer == NULL)
                _E("Failed add hold timer");
-       }
 }
 
 static void __delete_hold_timer(void)
@@ -424,9 +409,8 @@ static void __add_block_timer(void)
        __delete_block_timer();
 
        s_info.block_timer = ecore_timer_add(BLOCK_TIME, __block_timer_cb, NULL);
-       if (s_info.block_timer == NULL) {
+       if (s_info.block_timer == NULL)
                _E("Failed add block timer");
-       }
 }
 
 static void __delete_block_timer(void)
index f806925cc3fe3800be7a9bb005bbbb5c9eeabd3b..3468a6ef253a39dcb4a4f3f5a19dd3391299ccdc 100755 (executable)
--- a/src/bg.c
+++ b/src/bg.c
@@ -49,7 +49,7 @@ static bg_type_e _get_bg_type(void)
        /* 0 : Color, 1 : Image, 2 : Gallery */
        int val = -1;
 
-       if(vconf_get_int(VCONFKEY_WMS_BG_MODE, &val) < 0) {
+       if (vconf_get_int(VCONFKEY_WMS_BG_MODE, &val) < 0) {
                _E("Failed to get WMS_HOME_BG_MODE");
                return BG_TYPE_IMAGE;
        }
@@ -89,9 +89,8 @@ static void _change_bg(keynode_t *node, void *data)
        Evas_Object *bg;
        char *buf = NULL;
 
-       if (node) {
+       if (node)
                _D("BG is changed by vconf");
-       }
 
        bg = evas_object_data_get(win, DATA_KEY_BG);
        if (!bg) {
@@ -113,11 +112,11 @@ static void _change_bg(keynode_t *node, void *data)
                buf = (buf == NULL) ? strdup(DEFAULT_BG_PATH) : buf;
                break_if(!buf);
 
-               if (elm_bg_file_set(bg, buf, NULL) == EINA_FALSE) {
+               if (elm_bg_file_set(bg, buf, NULL) == EINA_FALSE)
                        _E("Failed to set BG file:%s", buf);
-               } else {
+               else
                        _D("BG is changed to %s", buf);
-               }
+
                _W("file size:%lld", ecore_file_size(buf));
                break;
        default:
@@ -166,9 +165,8 @@ HAPI Evas_Object *bg_create(Evas_Object *win)
        evas_object_event_callback_add(bg, EVAS_CALLBACK_MOUSE_DOWN, _bg_down_cb, NULL);
        evas_object_event_callback_add(bg, EVAS_CALLBACK_MOUSE_UP, _bg_up_cb, NULL);
 
-       if (vconf_notify_key_changed(VCONFKEY_WMS_BG_MODE, _change_bg, win) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_WMS_BG_MODE, _change_bg, win) < 0)
                _E("Failed to register the VCONFKEY_WMS_BG_MODE callback");
-       }
 
        /* Changing the bg after setting DATA_KEY_BG */
        _change_bg(NULL, win);
@@ -182,9 +180,8 @@ HAPI void bg_destroy(Evas_Object *win)
 {
        Evas_Object *bg = NULL;
 
-       if (vconf_ignore_key_changed(VCONFKEY_WMS_BG_MODE, _change_bg) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_WMS_BG_MODE, _change_bg) < 0)
                _E("Failed to ignore the VCONFKEY_WMS_BG_MODE callback");
-       }
 
        evas_object_event_callback_del(bg, EVAS_CALLBACK_MOUSE_DOWN, _bg_down_cb);
        evas_object_event_callback_del(bg, EVAS_CALLBACK_MOUSE_UP, _bg_up_cb);
@@ -200,9 +197,8 @@ HAPI void bg_register_object(Evas_Object *obj)
        Evas_Object *bg;
 
        bg = elm_object_part_content_get(obj, "bg");
-       if (bg) {
+       if (bg)
                evas_object_color_set(bg, 0, 0, 0, 0);
-       }
 }
 
 
index 1f2ba3dd7bddcade29f46079e0ecee73b00945e5..cd477b697cf53cbe735e2490c5632e8a1c7d37f4 100755 (executable)
@@ -69,9 +69,8 @@ static Evas_Object *_scroller_get(void)
 
        if (win != NULL) {
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-               if (layout != NULL) {
+               if (layout != NULL)
                        scroller = elm_object_part_content_get(layout, "scroller");
-               }
        }
 
        return scroller;
@@ -87,13 +86,12 @@ static void _del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        ret_if(!layout);
 
        obj_sub = elm_object_part_content_unset(layout, "clock_bg");
-       if (obj_sub != NULL) {
+       if (obj_sub != NULL)
                evas_object_del(obj_sub);
-       }
+
        obj_sub = elm_object_part_content_unset(layout, "event_blocker");
-       if (obj_sub != NULL) {
+       if (obj_sub != NULL)
                evas_object_del(obj_sub);
-       }
 }
 
 static void _clock_set_dnd_icon(int is_dnd_mode, Evas_Object *layout)
@@ -321,10 +319,10 @@ static Evas_Object *_clock_view_add(Evas_Object *parent, Evas_Object *item)
        }
 
        page = page_create(parent
-                                       , layout
-                                       , NULL, NULL
-                                       , main_get_info()->root_w, main_get_info()->root_h
-                                       , PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
+                       , layout
+                       , NULL, NULL
+                       , main_get_info()->root_w, main_get_info()->root_h
+                       , PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
        goto_if(page == NULL, ERR);
 
        page_set_effect(page, page_effect_none, page_effect_none);
@@ -372,9 +370,8 @@ static int _try_to_launch(const char *clock_pkgname)
        int clock_app_pid = 0;
        bundle *b;
 
-       if (!clock_pkgname) {
+       if (!clock_pkgname)
                clock_pkgname = "org.tizen.classic-watch";
-       }
 
        clock_info_s.launched = 0;
 
@@ -447,9 +444,8 @@ static void __watch_added(void *data, Evas_Object *obj, void *event_info)
 
        watch_manager_get_resource_id(clock, &resource_id);
        ret = vconf_set_int("memory/homescreen/watch_resource_id", resource_id);
-       if (ret != 0) {
+       if (ret != 0)
                _E("Failed to set vconfkey(%s) : %d", "memory/homescreen/watch_resource_id", ret);
-       }
 
        if (clock_info_s.cur_watch) {
                watch_manager_send_terminate(clock_info_s.cur_watch);
@@ -461,9 +457,9 @@ static void __watch_added(void *data, Evas_Object *obj, void *event_info)
                        evas_object_del(clock);
                        return;
                }
-               if (scroller_push_page(scroller, page, SCROLLER_PUSH_TYPE_CENTER) != W_HOME_ERROR_NONE) {
+               if (scroller_push_page(scroller, page, SCROLLER_PUSH_TYPE_CENTER) != W_HOME_ERROR_NONE)
                        _E("Fail to push the page into scroller");
-               }
+
                clock_info_s.clock_page = page;
        }
 
index 44fe7e90a2519127166786d2268759b13b22fd82..af701de2edb858039c801e7940cddc85f05b4e41 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -57,29 +57,29 @@ struct stmt {
 };
 
 #define CREATE_HOME_TABLE " \
-               PRAGMA journal_mode = PERSIST; \
-               CREATE TABLE IF NOT EXISTS home ( \
-                       id                      TEXT,\
-                       subid           TEXT,\
-                       ordering        INTEGER);"
+       PRAGMA journal_mode = PERSIST; \
+       CREATE TABLE IF NOT EXISTS home ( \
+               id                      TEXT,\
+               subid           TEXT,\
+               ordering        INTEGER);"
 
 HAPI w_home_error_e db_init(db_file_e db_file)
 {
-    int r;
-    char *errmsg = NULL;
-    char *app_data_path = NULL;
-    char db_file_path[PATH_MAX] = { 0, };
+       int r;
+       char *errmsg = NULL;
+       char *app_data_path = NULL;
+       char db_file_path[PATH_MAX] = { 0, };
 
-    retv_if(!db_file, W_HOME_ERROR_FAIL);
-    db_close();
+       retv_if(!db_file, W_HOME_ERROR_FAIL);
+       db_close();
 
-    /* Getting app data path */
-    app_data_path = app_get_data_path();
+       /* Getting app data path */
+       app_data_path = app_get_data_path();
 
-    if (app_data_path == NULL) {
+       if (app_data_path == NULL) {
                _E("fail to get app data path");
                return W_HOME_ERROR_FAIL;
-    }
+       }
 
        switch (db_file) {
        case DB_FILE_NORMAL:
@@ -96,26 +96,26 @@ HAPI w_home_error_e db_init(db_file_e db_file)
 
        free(app_data_path);
 
-    if (db_info.db_file == NULL) {
+       if (db_info.db_file == NULL) {
                _E("fail to get db_path");
-        return W_HOME_ERROR_INVALID_PARAMETER;
-    }
-    r = sqlite3_open_v2(db_info.db_file, &db_info.db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
-    if (r) {
-        db_util_close(db_info.db);
+               return W_HOME_ERROR_INVALID_PARAMETER;
+       }
+       r = sqlite3_open_v2(db_info.db_file, &db_info.db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
+       if (r) {
+               db_util_close(db_info.db);
                _E("fail to open db %d", r);
-        return W_HOME_ERROR_DB_FAILED;
-    }
+               return W_HOME_ERROR_DB_FAILED;
+       }
 
-    r = sqlite3_exec(db_info.db, CREATE_HOME_TABLE, NULL, NULL, &errmsg);
+       r = sqlite3_exec(db_info.db, CREATE_HOME_TABLE, NULL, NULL, &errmsg);
 
-    if (r != SQLITE_OK) {
+       if (r != SQLITE_OK) {
                _E("query error(%d)(%s)", r, errmsg);
-        sqlite3_free(errmsg);
-        db_util_close(db_info.db);
-        return W_HOME_ERROR_DB_FAILED;
-    }
-    return W_HOME_ERROR_NONE;
+               sqlite3_free(errmsg);
+               db_util_close(db_info.db);
+               return W_HOME_ERROR_DB_FAILED;
+       }
+       return W_HOME_ERROR_NONE;
 }
 
 
@@ -124,9 +124,8 @@ HAPI w_home_error_e db_open(const char *db_file)
        int ret;
 
        retv_if(!db_file, W_HOME_ERROR_INVALID_PARAMETER);
-       if (db_info.db) {
+       if (db_info.db)
                return W_HOME_ERROR_NONE;
-       }
 
        ret = db_util_open(db_file, &db_info.db, DB_UTIL_REGISTER_HOOK_METHOD);
        if (ret != SQLITE_OK)
@@ -365,9 +364,8 @@ HAPI w_home_error_e db_end_transaction(bool success)
                        if (ret != SQLITE_OK) {
                                _E("sqlite3_exec() Failed(%d)", ret);
                                ret = sqlite3_exec(db_info.db, "ROLLBACK TRANSACTION", NULL, NULL, NULL);
-                               if (ret != SQLITE_OK) {
+                               if (ret != SQLITE_OK)
                                        _E("sqlite3_exec() Failed(%d)", ret);
-                               }
 
                                return W_HOME_ERROR_FAIL;
                        }
@@ -385,16 +383,15 @@ HAPI w_home_error_e db_end_transaction(bool success)
 
 #define HOME_TABLE "home"
 #define QUERY_INSERT_ITEM "INSERT INTO "HOME_TABLE" "\
-               "(id, subid, ordering) "\
-               "VALUES "\
-               "('%s', '%s', %d);"
+       "(id, subid, ordering) "\
+       "VALUES "\
+       "('%s', '%s', %d);"
 HAPI int db_insert_item(const char *id, const char *subid, int ordering)
 {
        char *query;
 
        retv_if(!id, -1);
-       retv_if(W_HOME_ERROR_NONE !=
-                       db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        if (subid) {
                _D("Insert the item[%s:%s:%d]", id, subid, ordering);
@@ -426,8 +423,7 @@ HAPI int db_update_item(const char *id, const char *subid, int ordering)
        char *query;
 
        retv_if(!id, -1);
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        if (subid) {
                _D("Update the item[%s:%s:%d]", id, subid, ordering);
@@ -459,8 +455,7 @@ HAPI int db_update_item_by_ordering(const char *id, const char *subid, int order
        char *query = NULL;
 
        retv_if(!id, -1);
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        if (subid) {
                _SD("Update the item[%s:%s:%d]", id, subid, ordering);
@@ -492,8 +487,7 @@ HAPI int db_remove_item(const char *id, const char *subid)
        char *query;
 
        retv_if(!id, -1);
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        if (subid) {
                _D("Remove the item[%s:%s]", id, subid);
@@ -526,8 +520,7 @@ HAPI int db_remove_item_after_max(int max)
 
        _D("Remove the item after max[%d]", max);
 
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        query = sqlite3_mprintf(QUERY_REMOVE_ITEM_AFTER_MAX, max);
        retv_if(query == NULL, -1);
@@ -554,8 +547,7 @@ HAPI int db_remove_all_item(void)
 
        _D("Remove all the item");
 
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        query = sqlite3_mprintf(QUERY_REMOVE_ALL_ITEM);
        retv_if(query == NULL, -1);
@@ -568,11 +560,10 @@ HAPI int db_remove_all_item(void)
 
        sqlite3_free(query);
 
-       if (preference_set_string(VCONF_KEY_HOME_LOGGING, ";") != 0) {
+       if (preference_set_string(VCONF_KEY_HOME_LOGGING, ";") != 0)
                _SE("Failed to set %s as NULL", VCONF_KEY_HOME_LOGGING);
-       } else {
+       else
                _SD("Set %s as ';'", VCONF_KEY_HOME_LOGGING);
-       }
 
        /* keep the home DB opened */
 
@@ -588,8 +579,7 @@ HAPI int db_count_item(const char *id, const char *subid)
        int count;
 
        retv_if(id == NULL, -1);
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        st = db_prepare(QUERY_COUNT_ITEM);
        retv_if(st == NULL, -1);
@@ -636,8 +626,7 @@ HAPI int db_count_ordering(int ordering)
        stmt_h *st;
        int count;
 
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), -1);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), -1);
 
        st = db_prepare(QUERY_COUNT_ORDERING);
        retv_if(st == NULL, -1);
@@ -673,8 +662,7 @@ HAPI Eina_List *db_write_list(void)
        const char *id;
        const char *subid;
 
-       retv_if(W_HOME_ERROR_NONE !=
-                               db_open(db_info.db_file), NULL);
+       retv_if(W_HOME_ERROR_NONE != db_open(db_info.db_file), NULL);
 
        st = db_prepare(QUERY_SELECT_PAGE);
        goto_if(NULL == st, ERROR);
@@ -725,9 +713,9 @@ HAPI w_home_error_e db_read_list(Eina_List *page_info_list)
                if (!page_info->id) continue;
 
                db_insert_item(page_info->id, page_info->subid, ordering);
-               if (ordering) {
+               if (ordering)
                        eina_strbuf_append_char(strbuf, ';');
-               }
+
                eina_strbuf_append(strbuf, page_info->id);
                ordering++;
        }
@@ -735,9 +723,8 @@ HAPI w_home_error_e db_read_list(Eina_List *page_info_list)
        logging = eina_strbuf_string_get(strbuf);
        if (logging) {
                _SD("Logging : [%s]", logging);
-               if (preference_set_string(VCONF_KEY_HOME_LOGGING, logging) != 0) {
+               if (preference_set_string(VCONF_KEY_HOME_LOGGING, logging) != 0)
                        _E("Failed to set %s as %s", VCONF_KEY_HOME_LOGGING, logging);
-               }
        }
        eina_strbuf_free(strbuf);
 
index d2877ebc7880c5cba92885a1b42a07762168481f..02ee705446ebab1a1c996de12d37f405c5b5e591 100755 (executable)
@@ -48,8 +48,8 @@ typedef struct {
 } dbus_cb_s;
 
 HAPI int home_dbus_register_cb(
-       int type,
-       void (*result_cb)(void *, void *), void *result_data)
+               int type,
+               void (*result_cb)(void *, void *), void *result_data)
 {
        retv_if(result_cb == NULL, W_HOME_ERROR_INVALID_PARAMETER);
 
@@ -66,8 +66,8 @@ HAPI int home_dbus_register_cb(
 }
 
 HAPI void home_dbus_unregister_cb(
-       int type,
-       void (*result_cb)(void *, void *))
+               int type,
+               void (*result_cb)(void *, void *))
 {
        const Eina_List *l;
        const Eina_List *n;
@@ -94,23 +94,23 @@ static void _execute_cbs(int type, void *event_info)
        }
 }
 
-static Evas_Object *_scroller_get(void) {
+static Evas_Object *_scroller_get(void)
+{
        Evas_Object *win = main_get_info()->win;
        Evas_Object *layout = NULL;
        Evas_Object *scroller = NULL;
 
        if (win != NULL) {
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-               if (layout != NULL) {
+               if (layout != NULL)
                        scroller = elm_object_part_content_get(layout, "scroller");
-               }
        }
 
        return scroller;
 }
 
-static DBusConnection *_dbus_connection_get(void) {
-
+static DBusConnection *_dbus_connection_get(void)
+{
        if (s_info.connection == NULL) {
                DBusError derror;
                DBusConnection *connection = NULL;
@@ -174,9 +174,9 @@ static DBusHandlerResult _dbus_message_recv_cb(DBusConnection *connection, DBusM
                const char *state = NULL;
                dbus_error_init(&derror);
                ret = dbus_message_get_args(message, &derror, DBUS_TYPE_STRING, &state, DBUS_TYPE_INVALID);
-               if (!ret) {
+               if (!ret)
                        _E("Failed to get reply (%s:%s)", derror.name, derror.message);
-               }
+
                _execute_cbs(DBUS_EVENT_LCD_ON, (void*)state);
                dbus_error_free(&derror);
        } else if (dbus_message_is_signal(message, DBUS_DEVICED_DISPLAY_INTERFACE, DBUS_DEVICED_DISPLAY_MEMBER_LCD_OFF)) {
@@ -186,9 +186,9 @@ static DBusHandlerResult _dbus_message_recv_cb(DBusConnection *connection, DBusM
                const char *state = NULL;
                dbus_error_init(&derror);
                ret = dbus_message_get_args(message, &derror, DBUS_TYPE_STRING, &state, DBUS_TYPE_INVALID);
-               if (!ret) {
+               if (!ret)
                        _E("Failed to get reply (%s:%s)", derror.name, derror.message);
-               }
+
                _execute_cbs(DBUS_EVENT_LCD_OFF, (void*)state);
                dbus_error_free(&derror);
        } else if (dbus_message_is_signal(message, DBUS_DEVICED_SYSNOTI_INTERFACE, DBUS_DEVICED_SYSNOTI_MEMBER_COOLDOWN_CHANGED)) {
@@ -198,9 +198,9 @@ static DBusHandlerResult _dbus_message_recv_cb(DBusConnection *connection, DBusM
                const char *state = NULL;
                dbus_error_init(&derror);
                ret = dbus_message_get_args(message, &derror, DBUS_TYPE_STRING, &state, DBUS_TYPE_INVALID);
-               if (!ret) {
+               if (!ret)
                        _E("Failed to get reply (%s:%s)", derror.name, derror.message);
-               }
+
                _execute_cbs(DBUS_EVENT_COOLDOWN_STATE_CHANGED, (void *)state);
                dbus_error_free(&derror);
        } else if (dbus_message_is_signal(message, DBUS_ALPM_MANAGER_INTERFACE, DBUS_ALPM_MANAGER_MEMBER_STATUS)) {
@@ -210,9 +210,9 @@ static DBusHandlerResult _dbus_message_recv_cb(DBusConnection *connection, DBusM
                const char *state = NULL;
                dbus_error_init(&derror);
                ret = dbus_message_get_args(message, &derror, DBUS_TYPE_STRING, &state, DBUS_TYPE_INVALID);
-               if (!ret) {
+               if (!ret)
                        _E("Failed to get reply (%s:%s)", derror.name, derror.message);
-               }
+
                _execute_cbs(DBUS_EVENT_ALPM_MANAGER_STATE_CHANGED, (void *)state);
                dbus_error_free(&derror);
        }
@@ -247,7 +247,7 @@ static w_home_error_e _dbus_sig_attach(char *path, char *interface, char *member
        }
 
        /* Set the callback function */
-       if(dbus_connection_add_filter(connection, _dbus_message_recv_cb, NULL, NULL) == FALSE) {
+       if (dbus_connection_add_filter(connection, _dbus_message_recv_cb, NULL, NULL) == FALSE) {
                _E("Failed to add dbus filter : %s", derror.message);
                dbus_error_free(&derror);
                return W_HOME_ERROR_FAIL;
@@ -278,9 +278,8 @@ static void _dbus_sig_dettach(const char *path, const char *interface, const cha
 
        snprintf(rules, sizeof(rules), "path='%s',type='signal',interface='%s',member='%s'", path, interface, member);
        dbus_bus_remove_match(connection, rules, &err);
-       if(dbus_error_is_set(&err)) {
+       if (dbus_error_is_set(&err))
                _E("Failed to dbus_bus_remove_match : %s", err.message);
-       }
 
        dbus_error_free(&err);
 }
@@ -293,38 +292,38 @@ HAPI void *home_dbus_connection_get(void)
 HAPI void home_dbus_init(void *data)
 {
 
-       if(_dbus_sig_attach(
-               DBUS_LOW_BATTERY_PATH,
-               DBUS_LOW_BATTERY_INTERFACE,
-               DBUS_LOW_BATTERY_MEMBER_EXTREME_LEVEL) != W_HOME_ERROR_NONE) {
+       if (_dbus_sig_attach(
+                               DBUS_LOW_BATTERY_PATH,
+                               DBUS_LOW_BATTERY_INTERFACE,
+                               DBUS_LOW_BATTERY_MEMBER_EXTREME_LEVEL) != W_HOME_ERROR_NONE) {
                _E("Failed to attach low battery signal filter");
        }
 
-       if(_dbus_sig_attach(
-               DBUS_DEVICED_DISPLAY_PATH,
-               DBUS_DEVICED_DISPLAY_INTERFACE,
-               DBUS_DEVICED_DISPLAY_MEMBER_LCD_ON) != W_HOME_ERROR_NONE) {
+       if (_dbus_sig_attach(
+                               DBUS_DEVICED_DISPLAY_PATH,
+                               DBUS_DEVICED_DISPLAY_INTERFACE,
+                               DBUS_DEVICED_DISPLAY_MEMBER_LCD_ON) != W_HOME_ERROR_NONE) {
                _E("Failed to attach LCD on signal filter");
        }
 
-       if(_dbus_sig_attach(
-               DBUS_DEVICED_DISPLAY_PATH,
-               DBUS_DEVICED_DISPLAY_INTERFACE,
-               DBUS_DEVICED_DISPLAY_MEMBER_LCD_OFF) != W_HOME_ERROR_NONE) {
+       if (_dbus_sig_attach(
+                               DBUS_DEVICED_DISPLAY_PATH,
+                               DBUS_DEVICED_DISPLAY_INTERFACE,
+                               DBUS_DEVICED_DISPLAY_MEMBER_LCD_OFF) != W_HOME_ERROR_NONE) {
                _E("Failed to attach LCD off signal filter");
        }
 
-       if(_dbus_sig_attach(
-               DBUS_DEVICED_SYSNOTI_PATH,
-               DBUS_DEVICED_SYSNOTI_INTERFACE,
-               DBUS_DEVICED_SYSNOTI_MEMBER_COOLDOWN_CHANGED) != W_HOME_ERROR_NONE) {
+       if (_dbus_sig_attach(
+                               DBUS_DEVICED_SYSNOTI_PATH,
+                               DBUS_DEVICED_SYSNOTI_INTERFACE,
+                               DBUS_DEVICED_SYSNOTI_MEMBER_COOLDOWN_CHANGED) != W_HOME_ERROR_NONE) {
                _E("Failed to attach cooldown mode signal filter");
        }
 
-       if(_dbus_sig_attach(
-               DBUS_ALPM_MANAGER_PATH,
-               DBUS_ALPM_MANAGER_INTERFACE,
-               DBUS_ALPM_MANAGER_MEMBER_STATUS) != W_HOME_ERROR_NONE) {
+       if (_dbus_sig_attach(
+                               DBUS_ALPM_MANAGER_PATH,
+                               DBUS_ALPM_MANAGER_INTERFACE,
+                               DBUS_ALPM_MANAGER_MEMBER_STATUS) != W_HOME_ERROR_NONE) {
                _E("Failed to attach alpm manager signal filter");
        }
 }
@@ -333,36 +332,36 @@ HAPI void home_dbus_fini(void *data)
 {
 #if 0
        _dbus_sig_dettach(
-               DBUS_WAKEUP_GESTURE_PATH,
-               DBUS_WAKEUP_GESTURE_INTERFACE,
-               DBUS_WAKEUP_GESTURE_MEMBER_WAKEUP);
+                       DBUS_WAKEUP_GESTURE_PATH,
+                       DBUS_WAKEUP_GESTURE_INTERFACE,
+                       DBUS_WAKEUP_GESTURE_MEMBER_WAKEUP);
 #endif
        _dbus_sig_dettach(
-               DBUS_LOW_BATTERY_PATH,
-               DBUS_LOW_BATTERY_INTERFACE,
-               DBUS_LOW_BATTERY_MEMBER_EXTREME_LEVEL);
+                       DBUS_LOW_BATTERY_PATH,
+                       DBUS_LOW_BATTERY_INTERFACE,
+                       DBUS_LOW_BATTERY_MEMBER_EXTREME_LEVEL);
 
        _dbus_sig_dettach(
-               DBUS_DEVICED_DISPLAY_PATH,
-               DBUS_DEVICED_DISPLAY_INTERFACE,
-               DBUS_DEVICED_DISPLAY_MEMBER_LCD_ON);
+                       DBUS_DEVICED_DISPLAY_PATH,
+                       DBUS_DEVICED_DISPLAY_INTERFACE,
+                       DBUS_DEVICED_DISPLAY_MEMBER_LCD_ON);
 
        _dbus_sig_dettach(
-               DBUS_DEVICED_DISPLAY_PATH,
-               DBUS_DEVICED_DISPLAY_INTERFACE,
-               DBUS_DEVICED_DISPLAY_MEMBER_LCD_OFF);
+                       DBUS_DEVICED_DISPLAY_PATH,
+                       DBUS_DEVICED_DISPLAY_INTERFACE,
+                       DBUS_DEVICED_DISPLAY_MEMBER_LCD_OFF);
 
        _dbus_sig_dettach(
-               DBUS_DEVICED_SYSNOTI_PATH,
-               DBUS_DEVICED_SYSNOTI_INTERFACE,
-               DBUS_DEVICED_SYSNOTI_MEMBER_COOLDOWN_CHANGED);
+                       DBUS_DEVICED_SYSNOTI_PATH,
+                       DBUS_DEVICED_SYSNOTI_INTERFACE,
+                       DBUS_DEVICED_SYSNOTI_MEMBER_COOLDOWN_CHANGED);
 
        _dbus_sig_dettach(
-               DBUS_ALPM_MANAGER_PATH,
-               DBUS_ALPM_MANAGER_INTERFACE,
-               DBUS_ALPM_MANAGER_MEMBER_STATUS);
+                       DBUS_ALPM_MANAGER_PATH,
+                       DBUS_ALPM_MANAGER_INTERFACE,
+                       DBUS_ALPM_MANAGER_MEMBER_STATUS);
 
-       if(s_info.connection != NULL) {
+       if (s_info.connection != NULL) {
                dbus_connection_close(s_info.connection);
                dbus_connection_unref(s_info.connection);
                s_info.connection = NULL;
index 1fc5f26a7e5e16eb0c423d611d0769951fa45aba..31be84e0f94a4f99e66da52b2464bc6a3d15fc75 100755 (executable)
@@ -45,23 +45,23 @@ static int _append_variant(DBusMessageIter *iter, const char *sig, char *param[]
 
        for (ch = (char*)sig, i = 0; *ch != '\0'; ++i, ++ch) {
                switch (*ch) {
-                       case 'i':
-                               int_type = atoi(param[i]);
-                               dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &int_type);
-                               break;
-                       case 'u':
-                               int_type = atoi(param[i]);
-                               dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &int_type);
-                               break;
-                       case 't':
-                               int_type = atoi(param[i]);
-                               dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &int_type);
-                               break;
-                       case 's':
-                               dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &param[i]);
-                               break;
-                       default:
-                               return -EINVAL;
+               case 'i':
+                       int_type = atoi(param[i]);
+                       dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &int_type);
+                       break;
+               case 'u':
+                       int_type = atoi(param[i]);
+                       dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &int_type);
+                       break;
+               case 't':
+                       int_type = atoi(param[i]);
+                       dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &int_type);
+                       break;
+               case 's':
+                       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &param[i]);
+                       break;
+               default:
+                       return -EINVAL;
                }
        }
 
@@ -97,8 +97,8 @@ static int _dbus_message_send(const char *path, const char *interface, const cha
 }
 
 static int _dbus_method_async_call(const char *dest, const char *path,
-                               const char *interface, const char *method,
-                                               const char *sig, char *param[])
+               const char *interface, const char *method,
+               const char *sig, char *param[])
 {
        int ret = 0;
        DBusConnection *conn = NULL;
@@ -144,8 +144,8 @@ static int _dbus_method_async_call(const char *dest, const char *path,
 
 
 static DBusMessage *_dbus_method_sync_call(const char *dest, const char *path,
-                               const char *interface, const char *method,
-                                               const char *sig, char *param[])
+               const char *interface, const char *method,
+               const char *sig, char *param[])
 {
        int ret = 0;
        DBusConnection *conn = NULL;
@@ -177,7 +177,8 @@ static DBusMessage *_dbus_method_sync_call(const char *dest, const char *path,
 
        reply = dbus_connection_send_with_reply_and_block(conn, msg, DBUS_REPLY_TIMEOUT, &err);
        if (!reply) {
-               _E("dbus_connection_send error(No reply): (%s:%s:%s:%s)", dest, path, interface, method);
+               _E("dbus_connection_send error(No reply): (%s:%s:%s:%s)",
+                               dest, path, interface, method);
        }
 
        if (dbus_error_is_set(&err)) {
@@ -316,9 +317,8 @@ HAPI char *home_dbus_cooldown_status_get(void)
        if (!ret) {
                _E("Failed to get reply (%s:%s)", err.name, err.message);
        } else {
-               if (data != NULL) {
+               if (data != NULL)
                        ret_val = strdup(data);
-               }
        }
 
        dbus_message_unref(msg);
index 3e479b858fe6f4a3e1c8c789ff77f0f9e456054a..8b056937e85eb54b15777038f87ca92c04f561f7 100755 (executable)
@@ -308,7 +308,7 @@ static Eina_Bool _anim_move_page_to_empty_position(void *data)
        int vec_x, vec_y;
 
        goto_if(!data, ERROR);
-       if(!page_inner) {
+       if (!page_inner) {
                _D("page_inner was not unset");
                goto ERROR;
        }
@@ -322,7 +322,7 @@ static Eina_Bool _anim_move_page_to_empty_position(void *data)
        end_y = (int)evas_object_data_get(proxy_page, PRIVATE_DATA_KEY_PAGE_Y_FOR_ANIM);
 
        if (cur_y == end_y && cur_x == end_x) {
-               goto_if (NULL == _content_set_page_inner(proxy_page), ERROR);
+               goto_if(NULL == _content_set_page_inner(proxy_page), ERROR);
                /* unfreeze the scroller after setting the content */
                if (scroller) scroller_unfreeze(scroller);
 
@@ -459,7 +459,7 @@ static void _down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        evas_object_geometry_get(page_inner, &inner_x, &inner_y, &inner_w, &inner_h);
 
        /* this data key is used the destination in animation of item's set.
-       If the destination of animation can be changed, you set the changed value  in _up_cb or other function */
+          If the destination of animation can be changed, you set the changed value  in _up_cb or other function */
        evas_object_data_set(proxy_page, PRIVATE_DATA_KEY_PAGE_X_FOR_ANIM, (void *) inner_x);
        evas_object_data_set(proxy_page, PRIVATE_DATA_KEY_PAGE_Y_FOR_ANIM, (void *) inner_y);
 
@@ -536,9 +536,8 @@ static void _move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        int cur_x, cur_y, vec_x, vec_y;
 
        ret_if(!proxy_page);
-       if (!evas_object_data_get(proxy_page, PRIVATE_DATA_KEY_PAGE_PRESSED)) {
+       if (!evas_object_data_get(proxy_page, PRIVATE_DATA_KEY_PAGE_PRESSED))
                return;
-       }
 
        anim = evas_object_data_get(proxy_page, PRIVATE_DATA_KEY_PAGE_ANIM_FOR_MOVING);
        if (anim) return;
@@ -655,9 +654,8 @@ static void _up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        anim = ecore_animator_add(_anim_move_page_to_empty_position, proxy_page);
        ret_if(NULL == anim);
        evas_object_data_set(proxy_page, PRIVATE_DATA_KEY_PAGE_ANIM_FOR_MOVING, anim);
-       if (evas_object_data_get(page_info->scroller, PRIVATE_DATA_KEY_EDIT_IS_LONGPRESSED)) {
+       if (evas_object_data_get(page_info->scroller, PRIVATE_DATA_KEY_EDIT_IS_LONGPRESSED))
                elm_object_signal_emit(page_info->page_inner, "reset,zoom", "inner");
-       }
 }
 
 
@@ -728,8 +726,8 @@ static key_cb_ret_e _add_viewer_home_key_cb(void *data)
 static void _edit_button_click_cb(void *data, Evas_Object *obj, void *event_info)
 {
        // Launch the app-shortcut launcher app
-       _D("_edit_button_click_cb" );
-       Evas_Object *layout =data;
+       _D("_edit_button_click_cb");
+       Evas_Object *layout = data;
        layout_info_s *layout_info = NULL;
        Evas_Object* focus_page = NULL;
        page_info_s *page_info = NULL;
@@ -737,32 +735,32 @@ static void _edit_button_click_cb(void *data, Evas_Object *obj, void *event_info
        const char *content_info = NULL;
        const char *instance_id = NULL;
 
-       if(!layout)     {
-               _E("layout is null " );
+       if (!layout) {
+               _E("layout is null");
                return;
        }
 
        layout_info = evas_object_data_get(layout, DATA_KEY_LAYOUT_INFO);
-       if(!layout_info || !layout_info->scroller) {
-               _E("layout info is null " );
+       if (!layout_info || !layout_info->scroller) {
+               _E("layout info is null");
                return;
        }
-       
+
        focus_page = scroller_get_focused_page(layout_info->scroller);
-       if(!focus_page) {
-               _E("focus page is null " );
+       if (!focus_page) {
+               _E("focus page is null");
                return;
        }
 
        page_info = evas_object_data_get(focus_page , DATA_KEY_PAGE_INFO);
-       if(!page_info ) {
-               _E("focus page_info is null " );
+       if (!page_info) {
+               _E("focus page_info is null");
                return;
        }
 
        widget_id = widget_viewer_evas_get_widget_id(page_info->item);
-       if(!widget_id) {
-               _E("widget id is null " );
+       if (!widget_id) {
+               _E("widget id is null");
                return;
        }
 
@@ -776,9 +774,9 @@ static void _edit_button_click_cb(void *data, Evas_Object *obj, void *event_info
        instance_id = widget_viewer_evas_get_widget_instance_id(page_info->item);
        app_control_set_operation(service, APP_CONTROL_OPERATION_MAIN);
        app_control_add_extra_data(service, APP_CONTROL_DATA_WIDGET_INSTANCE_ID, instance_id);
-       if (content_info) {
+       if (content_info)
                app_control_add_extra_data(service, APP_CONTROL_DATA_WIDGET_CONTENT, content_info);
-       }
+
        char *setup_appid = widget_service_get_app_id_of_setup_app(page_info->id);
        app_control_set_app_id(service, setup_appid);
 
@@ -878,7 +876,7 @@ HAPI void edit_change_focus(Evas_Object *edit_scroller, Evas_Object *page_curren
        int unfocusable = 0;
 
        ret_if(!edit_scroller);
-       if(!page_current) {
+       if (!page_current) {
                evas_object_data_set(edit_scroller, PRIVATE_DATA_KEY_EDIT_FOCUS_OBJECT, NULL);
                return;
        }
@@ -890,26 +888,24 @@ HAPI void edit_change_focus(Evas_Object *edit_scroller, Evas_Object *page_curren
        ret_if(!page_info);
        ret_if(!page_info->page_inner);
        ret_if(!page_info->item);
-       if(page_info->layout)
+       if (page_info->layout)
                layout_info = evas_object_data_get(page_info->layout, DATA_KEY_LAYOUT_INFO);
 
-       if (layout_info)
-       {
-               if(page_info->id)
-               {
+       if (layout_info) {
+               if (page_info->id) {
                        char *setup_appid = NULL;
 
                        setup_appid = widget_service_get_app_id_of_setup_app(page_info->id);
                        if (setup_appid) {
-                               _D( " Showing edit button for page %s", setup_appid);
+                               _D(" Showing edit button for page %s", setup_appid);
                                elm_object_signal_emit(layout_info->edit, "edit,show", "edit");
                        } else {
-                               _D( " Hiding edit button for page %s", setup_appid);
+                               _D(" Hiding edit button for page %s", setup_appid);
                                elm_object_signal_emit(layout_info->edit, "edit,hide", "edit");
                        }
                        free(setup_appid);
                } else {
-                       _D( " Hiding edit button for page %s", page_info->id);
+                       _D(" Hiding edit button for page %s", page_info->id);
                        elm_object_signal_emit(layout_info->edit, "edit,hide", "edit");
                }
        }
@@ -919,7 +915,7 @@ HAPI void edit_change_focus(Evas_Object *edit_scroller, Evas_Object *page_curren
 
        evas_object_data_set(edit_scroller, PRIVATE_DATA_KEY_EDIT_FOCUS_OBJECT, page_current);
 
-       if(page_focused) {
+       if (page_focused) {
                focused_page_info = evas_object_data_get(page_focused, DATA_KEY_PAGE_INFO);
                if (!focused_page_info) goto OUT;
                if (!focused_page_info->page_inner) goto OUT;
@@ -976,7 +972,8 @@ static void _remove_widget(Evas_Object *page)
 
        focused_page = evas_object_data_get(edit_info->scroller, PRIVATE_DATA_KEY_EDIT_FOCUS_OBJECT);
        if (proxy_page == focused_page) {
-               evas_object_data_set(edit_info->scroller, PRIVATE_DATA_KEY_EDIT_FOCUS_OBJECT, NULL);
+               evas_object_data_set(edit_info->scroller,
+                               PRIVATE_DATA_KEY_EDIT_FOCUS_OBJECT, NULL);
        }
 
        scroller_pop_page(edit_info->scroller, proxy_page);
@@ -1083,10 +1080,10 @@ static Evas_Object *_add_widget_in_normal(Evas_Object *layout, const char *id, c
        evas_object_show(item);
 
        page = page_create(layout_info->scroller
-                                                       , item
-                                                       , id, NULL
-                                                       , scroller_info->page_width, scroller_info->page_height
-                                                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
+                       , item
+                       , id, NULL
+                       , scroller_info->page_width, scroller_info->page_height
+                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
        goto_if(!page, ERROR);
        widget_add_callback(item, page);
        page_set_effect(page, page_effect_none, page_effect_none);
@@ -1152,10 +1149,10 @@ static Evas_Object *add_widget_in_edit(Evas_Object *layout, const char *id, cons
        evas_object_show(item);
 
        page = page_create(layout_info->scroller
-                                                       , item
-                                                       , id, NULL
-                                                       , scroller_info->page_width, scroller_info->page_height
-                                                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
+                       , item
+                       , id, NULL
+                       , scroller_info->page_width, scroller_info->page_height
+                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
        goto_if(!page, ERROR);
        widget_add_callback(item, page);
        page_set_effect(page, page_effect_none, page_effect_none);
@@ -1184,7 +1181,8 @@ static Evas_Object *add_widget_in_edit(Evas_Object *layout, const char *id, cons
        evas_object_smart_callback_add(proxy_page_info->remove_focus, "clicked",  _del_widget_cb, proxy_page);
 
        if (edit_scroller_info->single_index) {
-               index_update(edit_scroller_info->single_index, edit_info->scroller, INDEX_BRING_IN_NONE);
+               index_update(edit_scroller_info->single_index,
+                               edit_info->scroller, INDEX_BRING_IN_NONE);
        }
 
        index_bring_in_page(edit_scroller_info->single_index, proxy_page);
@@ -1197,9 +1195,9 @@ static Evas_Object *add_widget_in_edit(Evas_Object *layout, const char *id, cons
        return page;
 
 ERROR:
-       if (page) {
+       if (page)
                _remove_widget(page);
-       }
+
        return NULL;
 }
 
@@ -1529,9 +1527,11 @@ static Eina_Bool _move_timer_cb(void *data)
        retv_if(-1 == idx_above_page, ECORE_CALLBACK_CANCEL);
 
        if (idx_above_page < idx_below_page) {
-               scroller_move_page_prev(page_info->scroller, pressed_page, proxy_page, pressed_page);
+               scroller_move_page_prev(page_info->scroller,
+                               pressed_page, proxy_page, pressed_page);
        } else {
-               scroller_move_page_next(page_info->scroller, proxy_page, pressed_page, pressed_page);
+               scroller_move_page_next(page_info->scroller,
+                               proxy_page, pressed_page, pressed_page);
        }
 
        scroller_bring_in_center_of(page_info->scroller, pressed_page, SCROLLER_FREEZE_ON, NULL, NULL, NULL, NULL);
@@ -1630,10 +1630,10 @@ Evas_Object *edit_create_proxy_page(Evas_Object *edit_scroller, Evas_Object *rea
 
        /* Proxy Page */
        proxy_page = page_create(edit_scroller
-                                                               , proxy_item
-                                                               , page_info->id, page_info->subid
-                                                               , PAGE_EDIT_WIDTH, PAGE_EDIT_HEIGHT
-                                                               , changable_color, page_info->removable);
+                       , proxy_item
+                       , page_info->id, page_info->subid
+                       , PAGE_EDIT_WIDTH, PAGE_EDIT_HEIGHT
+                       , changable_color, page_info->removable);
        if (!proxy_page) {
                _E("Cannot create a page");
                _destroy_proxy_item(proxy_item);
@@ -1648,9 +1648,8 @@ Evas_Object *edit_create_proxy_page(Evas_Object *edit_scroller, Evas_Object *rea
                return NULL;
        }
        elm_object_signal_emit(proxy_page_info->page_inner, "enable", "blocker");
-       if (proxy_page_info->removable) {
+       if (proxy_page_info->removable)
                elm_object_signal_emit(proxy_page_info->page_inner, "show", "del");
-       }
 
        /* Edit Access Object */
        access_info_t *access_info = NULL;
@@ -1730,9 +1729,9 @@ void edit_destroy_proxy_page(Evas_Object *proxy_page)
                proxy_page_info->access_info = NULL;
        }
 
-       if (proxy_page_info->item) {
+       if (proxy_page_info->item)
                _destroy_proxy_item(proxy_page_info->item);
-       }
+
        page_destroy(proxy_page);
 }
 
@@ -1763,7 +1762,8 @@ static Eina_Bool _enlarge_widget_anim_cb(void *data)
 
        divide_factor = (int) evas_object_data_get(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR);
        if (divide_factor > 1) {
-               evas_object_data_set(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR, (void *) divide_factor - 1);
+               evas_object_data_set(effect_page,
+                               PRIVATE_DATA_KEY_DIVIDE_FACTOR, (void *)divide_factor - 1);
        }
 
        vec_x = (end_x - cur_x) / divide_factor;
@@ -1781,9 +1781,8 @@ static Eina_Bool _enlarge_widget_anim_cb(void *data)
        cur_w += vec_w;
        cur_h += vec_h;
 
-       if (cur_x < end_x) {
+       if (cur_x < end_x)
                goto OUT;
-       }
 
        evas_object_move(effect_page, cur_x, cur_y);
        evas_object_resize(effect_page, cur_w, cur_h);
@@ -1851,9 +1850,9 @@ static void _widget_selected_cb(void *data, Evas_Object *add_viewer, void *event
                edit_info_s *edit_info = NULL;
 
                evas_object_del(e->pkg_info.image);
-               if (!add_widget_in_edit(layout, e->pkg_info.widget_id, e->pkg_info.content)) {
+               if (!add_widget_in_edit(layout, e->pkg_info.widget_id, e->pkg_info.content))
                        _E("Cannot add widget in edit mode");
-               }
+
                edit_destroy_add_viewer(layout);
 
                edit_info = evas_object_data_get(layout_info->edit, DATA_KEY_EDIT_INFO);
@@ -1869,9 +1868,8 @@ static void _widget_selected_cb(void *data, Evas_Object *add_viewer, void *event
                evas_object_data_set(e->pkg_info.image, DATA_KEY_BG, clip_bg);
                edit_enlarge_effect_widget(e->pkg_info.image);
 
-               if (!_add_widget_in_normal(layout, e->pkg_info.widget_id, e->pkg_info.content)) {
+               if (!_add_widget_in_normal(layout, e->pkg_info.widget_id, e->pkg_info.content))
                        _E("Cannot add widget in widget scroller");
-               }
 
                scroller_register_access_object(layout_info->scroller);
                scroller_init_rotary(layout_info->scroller);
@@ -1922,13 +1920,11 @@ HAPI Evas_Object *edit_create_add_viewer(Evas_Object *layout)
 
        evas_object_data_set(layout, DATA_KEY_ADD_VIEWER, add_viewer);
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _add_viewer_back_key_cb, layout)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _add_viewer_back_key_cb, layout))
                _E("Cannot register the key callback");
-       }
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _add_viewer_home_key_cb, layout)) {
-               _E("Cannot register the key callback");
-       }
 
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _add_viewer_home_key_cb, layout))
+               _E("Cannot register the key callback");
 
        return add_viewer;
 }
@@ -1986,7 +1982,7 @@ HAPI void edit_destroy_add_viewer(Evas_Object *layout)
        /* Destroy Add viewer Access object */
        Evas_Object *preview = NULL;
        Eina_List *find_list = NULL;
-       Eina_List *preview_list= NULL;
+       Eina_List *preview_list = NULL;
        page_info_s *page_info = NULL;
 
        preview_list = elm_box_children_get(scroller_info->box);
@@ -2034,7 +2030,7 @@ HAPI char *edit_get_count_str_from_icu(int count)
        locale = vconf_get_str(VCONFKEY_REGIONFORMAT);
        retv_if(!locale, NULL);
 
-       if(locale[0] != '\0') {
+       if (locale[0] != '\0') {
                p = strstr(locale, ".UTF-8");
                if (p) *p = 0;
        }
@@ -2066,9 +2062,8 @@ static void _plus_item_clicked_cb(void *data, Evas_Object *obj, const char *emis
 
        edit_change_focus(edit_info->scroller, NULL);
 
-       if (!edit_create_add_viewer(edit_info->layout)) {
+       if (!edit_create_add_viewer(edit_info->layout))
                _E("Cannot add the add-viewer");
-       }
 
        effect_play_sound();
        page_focus(edit_info->scroller, NULL);
@@ -2192,10 +2187,10 @@ Evas_Object *_create_plus_page(Evas_Object *edit)
        elm_object_part_text_set(plus_item, "plus_text", _("IDS_HS_BODY_ADD_WIDGET"));
 
        page = page_create(edit_info->scroller,
-                                                       plus_item,
-                                                       NULL, NULL,
-                                                       edit_scroller_info->page_width, edit_scroller_info->page_height,
-                                                       PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
+                       plus_item,
+                       NULL, NULL,
+                       edit_scroller_info->page_width, edit_scroller_info->page_height,
+                       PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
        if (!page) {
                _E("Cannot create the page");
                evas_object_del(plus_item);
@@ -2724,9 +2719,9 @@ HAPI void _destroy_right_layout(Evas_Object *layout)
        edit_info = evas_object_data_get(layout_info->edit, DATA_KEY_EDIT_INFO);
        ret_if(!edit_info);
 
-       if (!evas_object_data_get(layout, PRIVATE_DATA_KEY_EDIT_SYNC_IS_DONE)) {
+       if (!evas_object_data_get(layout, PRIVATE_DATA_KEY_EDIT_SYNC_IS_DONE))
                _sync_from_edit_to_normal(layout);
-       }
+
        evas_object_data_del(layout, PRIVATE_DATA_KEY_EDIT_SYNC_IS_DONE);
 
        layout_add_mouse_cb(layout);
@@ -2734,9 +2729,8 @@ HAPI void _destroy_right_layout(Evas_Object *layout)
        edit_scroller_info = evas_object_data_get(edit_info->scroller, DATA_KEY_SCROLLER_INFO);
        ret_if(!edit_scroller_info);
 
-       if (edit_scroller_info->single_index) {
+       if (edit_scroller_info->single_index)
                index_destroy(edit_scroller_info->single_index);
-       }
 
        _scroller_pop_right_page(layout_info->edit);
        _remove_padding(edit_info->scroller);
@@ -2862,9 +2856,8 @@ HAPI void _destroy_left_layout(Evas_Object *layout)
        _scroller_pop_left_page(layout_info->edit);
        _remove_padding(edit_info->scroller);
 
-       if (edit_scroller_info->single_index) {
+       if (edit_scroller_info->single_index)
                index_destroy(edit_scroller_info->single_index);
-       }
 
        scroller_destroy(layout_info->edit);
 
@@ -3002,7 +2995,7 @@ static void _destroy_proxy_bg(Evas_Object *clip_bg)
        Evas_Object *proxy_bg = NULL;
 
        proxy_bg = evas_object_data_del(clip_bg, PRIVATE_DATA_KEY_PROXY_BG);
-       if(proxy_bg) evas_object_del(proxy_bg);
+       if (proxy_bg) evas_object_del(proxy_bg);
        evas_object_del(clip_bg);
 }
 
@@ -3065,13 +3058,11 @@ HAPI Evas_Object *edit_create_layout(Evas_Object *layout, edit_mode_e edit_mode)
        layout_info = evas_object_data_get(layout, DATA_KEY_LAYOUT_INFO);
        retv_if(!layout_info, NULL);
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _edit_back_key_cb, layout)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _edit_back_key_cb, layout))
                _E("Cannot register the key callback");
-       }
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _edit_home_key_cb, layout)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _edit_home_key_cb, layout))
                _E("Cannot register the key callback");
-       }
 
        switch (edit_mode) {
        case EDIT_MODE_LEFT:
@@ -3094,14 +3085,15 @@ HAPI Evas_Object *edit_create_layout(Evas_Object *layout, edit_mode_e edit_mode)
        layout_info->edit = edit;
 
        edit_info = evas_object_data_get(edit, DATA_KEY_EDIT_INFO);
-       if (edit_info && edit_info->scroller) {
+       if (edit_info && edit_info->scroller)
                scroller_focus(edit_info->scroller);
-       } else _E("Cannot get the edit_info & edit_info->scroller");
+       else
+               _E("Cannot get the edit_info & edit_info->scroller");
 
        elm_object_tree_focus_allow_set(layout_info->scroller, EINA_FALSE);
        /* If you want to set the EINA_TRUE in this API,
-        you have to control the tree focus set when using content_set or content_unset API
-        in the layout that elm_object_tree_focus_allow_set is EINA_TRUE*/
+          you have to control the tree focus set when using content_set or content_unset API
+          in the layout that elm_object_tree_focus_allow_set is EINA_TRUE*/
        elm_object_tree_focus_allow_set(layout_info->edit, EINA_TRUE);
 
        return edit;
@@ -3182,9 +3174,10 @@ static Eina_Bool _minify_page_anim_cb(void *data)
        evas_object_geometry_get(page_inner, &end_x, &end_y, &end_w, &end_h);
        evas_object_geometry_get(effect_page, &cur_x, &cur_y, &cur_w, &cur_h);
 
-       divide_factor = (int) evas_object_data_get(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR);
+       divide_factor = (int)evas_object_data_get(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR);
        if (divide_factor > 2) {
-               evas_object_data_set(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR, (void *) divide_factor - 1);
+               evas_object_data_set(effect_page,
+                               PRIVATE_DATA_KEY_DIVIDE_FACTOR, (void *)divide_factor - 1);
        }
 
        vec_x = (end_x - cur_x) / divide_factor;
@@ -3270,9 +3263,8 @@ static Eina_Bool _enlarge_page_anim_cb(void *data)
        evas_object_geometry_get(effect_page, &cur_x, &cur_y, &cur_w, &cur_h);
 
        divide_factor = (int) evas_object_data_get(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR);
-       if (divide_factor > 1) {
+       if (divide_factor > 1)
                evas_object_data_set(effect_page, PRIVATE_DATA_KEY_DIVIDE_FACTOR, (void *) divide_factor - 1);
-       }
 
        vec_x = (end_x - cur_x) / divide_factor;
        vec_y = (end_y - cur_y) / divide_factor;
@@ -3289,9 +3281,8 @@ static Eina_Bool _enlarge_page_anim_cb(void *data)
        cur_w += vec_w;
        cur_h += vec_h;
 
-       if (cur_x < end_x) {
+       if (cur_x < end_x)
                goto OUT;
-       }
 
        evas_object_move(effect_page, cur_x, cur_y);
        evas_object_resize(effect_page, cur_w, cur_h);
@@ -3350,9 +3341,8 @@ HAPI Evas_Object *edit_create_minify_effect_page(Evas_Object *page)
        page_info = evas_object_data_get(page, DATA_KEY_PAGE_INFO);
        retv_if(!page_info, NULL);
 
-       if (page_info->removable) {
+       if (page_info->removable)
                elm_object_signal_emit(page_info->page_inner, "hide", "del");
-       }
 
        elm_object_signal_emit(page_info->page_inner, "deselect", "cover");
        elm_object_signal_emit(page_info->page_inner, "deselect", "cover_clipper");
@@ -3416,9 +3406,8 @@ HAPI void edit_destroy_minify_effect_page(Evas_Object *effect_page)
        ret_if(!page_info);
        scroller_enable_cover_on_scroll(page_info->scroller);
 
-       if (page_info->removable) {
+       if (page_info->removable)
                elm_object_signal_emit(page_info->page_inner, "show", "del");
-       }
 
        evas_object_image_source_visible_set(effect_page, EINA_TRUE);
        evas_object_del(effect_page);
@@ -3499,9 +3488,8 @@ HAPI Evas_Object *edit_create_enlarge_effect_page(Evas_Object *page)
        real_page = evas_object_data_get(page, DATA_KEY_REAL_PAGE);
        retv_if(!real_page, NULL);
 
-       if (page_info->removable) {
+       if (page_info->removable)
                elm_object_signal_emit(page_info->page_inner, "hide", "del");
-       }
 
        elm_object_signal_emit(page_info->page_inner, "deselect", "cover");
        elm_object_signal_emit(page_info->page_inner, "deselect", "cover_clipper");
@@ -3604,9 +3592,9 @@ static Evas_Object *_create_refresh_left_page(Evas_Object *edit, Evas_Object *pa
        return proxy_page;
 
 ERROR:
-       if (proxy_page) {
+       if (proxy_page)
                edit_destroy_proxy_page(proxy_page);
-       }
+
        return NULL;
 }
 
@@ -3642,9 +3630,9 @@ static Evas_Object *_create_refresh_right_page(Evas_Object *edit, Evas_Object *p
        return proxy_page;
 
 ERROR:
-       if (proxy_page) {
+       if (proxy_page)
                edit_destroy_proxy_page(proxy_page);
-       }
+
        return NULL;
 }
 
@@ -3702,11 +3690,10 @@ HAPI void edit_refresh_scroller(Evas_Object *edit, page_direction_e direction)
                        if (!proxy_page) {
                                proxy_page = _create_refresh_right_page(edit, page);
                                break_if(!proxy_page);
-                               if (edit_info->plus_page) {
+                               if (edit_info->plus_page)
                                        scroller_push_page_before(edit_info->scroller, proxy_page, edit_info->plus_page);
-                               } else {
+                               else
                                        scroller_push_page_before(edit_info->scroller, proxy_page, NULL);
-                               }
                        }
                }
                break;
index ed2f8816df588c760c8a6753e72d3f5588a3dee9..2a453e8c8c90f7728b9be5fcb01bc4aa18cb451c 100755 (executable)
@@ -81,21 +81,20 @@ HAPI void effect_play_sound(void)
 {
        int state = main_get_info()->state;
 
-       if (APP_STATE_PAUSE == state)
-       {
+       if (APP_STATE_PAUSE == state) {
                _D("Do not play sound");
                return;
        }
 
-       if (effect_info.is_feedback_initialized == 0) {
+       if (effect_info.is_feedback_initialized == 0)
                effect_init();
-       }
 
-       //ret_if(runtime_info_get_value_bool(RUNTIME_INFO_KEY_SILENT_MODE_ENABLED, &effect_info.sound_status) < 0);
+#if 0
+       ret_if(runtime_info_get_value_bool(RUNTIME_INFO_KEY_SILENT_MODE_ENABLED, &effect_info.sound_status) < 0);
 
-       if (effect_info.sound_status) {
-               //feedback_play_type(FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_TOUCH_TAP);
-       }
+       if (effect_info.sound_status)
+               feedback_play_type(FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_TOUCH_TAP);
+#endif
 }
 
 
@@ -104,15 +103,13 @@ HAPI void effect_play_vibration(void)
 {
        int state = main_get_info()->state;
 
-       if (APP_STATE_PAUSE == state)
-       {
+       if (APP_STATE_PAUSE == state) {
                _D("Do not play vibration");
                return;
        }
 
-       if (effect_info.is_feedback_initialized == 0) {
+       if (effect_info.is_feedback_initialized == 0)
                effect_init();
-       }
 
        feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_HOLD);
 }
index 3112db13741a21fc5ebed2cb24ba1ec0e6e5b75e..516b0c4d5f630d669851c83d08176a66c29a61e3 100755 (executable)
@@ -53,27 +53,27 @@ typedef struct {
        void *result_data;
 } gesture_cb_s;
 
-static Evas_Object *_layout_get(void) {
+static Evas_Object *_layout_get(void)
+{
        Evas_Object *win = main_get_info()->win;
        Evas_Object *layout = NULL;
 
-       if (win != NULL) {
+       if (win != NULL)
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-       }
 
        return layout;
 }
 
-static Evas_Object *_scroller_get(void) {
+static Evas_Object *_scroller_get(void)
+{
        Evas_Object *win = main_get_info()->win;
        Evas_Object *layout = NULL;
        Evas_Object *scroller = NULL;
 
        if (win != NULL) {
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-               if (layout != NULL) {
+               if (layout != NULL)
                        scroller = elm_object_part_content_get(layout, "scroller");
-               }
        }
 
        return scroller;
@@ -88,15 +88,15 @@ static void _clock_show(void)
        Evas_Object *layout = _layout_get();
        ret_if(layout == NULL);
 #if 0
-       if (tutorial_is_exist() == 1) {
-               return ;
-       }
+       if (tutorial_is_exist() == 1)
+               return;
 #endif
        /* delete edit/addviewer layout */
        layout_set_idle(layout);
 
        if (is_clock_displayed == 0) {
-               scroller_bring_in_by_push_type(scroller, SCROLLER_PUSH_TYPE_CENTER, SCROLLER_FREEZE_OFF, SCROLLER_BRING_TYPE_INSTANT_SHOW);
+               scroller_bring_in_by_push_type(scroller,
+                               SCROLLER_PUSH_TYPE_CENTER, SCROLLER_FREEZE_OFF, SCROLLER_BRING_TYPE_INSTANT_SHOW);
        }
 
        int w, h;
@@ -135,9 +135,12 @@ static void _alpm_manager_status_changed_cb(void *user_data, void *event_info)
 
 HAPI void home_gesture_init(void)
 {
-       if (home_dbus_register_cb(DBUS_EVENT_ALPM_MANAGER_STATE_CHANGED, _alpm_manager_status_changed_cb, NULL) != W_HOME_ERROR_NONE) {
+       int ret;
+
+       ret = home_dbus_register_cb(DBUS_EVENT_ALPM_MANAGER_STATE_CHANGED,
+                       _alpm_manager_status_changed_cb, NULL);
+       if (W_HOME_ERROR_NONE != ret)
                _E("Failed to register alpm manager status changed cb");
-       }
 }
 
 HAPI void home_gesture_fini(void)
@@ -148,8 +151,8 @@ HAPI void home_gesture_fini(void)
 
 
 HAPI w_home_error_e gesture_register_cb(
-       int mode,
-       void (*result_cb)(void *), void *result_data)
+               int mode,
+               void (*result_cb)(void *), void *result_data)
 {
        retv_if(NULL == result_cb, W_HOME_ERROR_INVALID_PARAMETER);
 
@@ -168,17 +171,17 @@ HAPI w_home_error_e gesture_register_cb(
 
 
 HAPI void gesture_unregister_cb(
-       int mode,
-       void (*result_cb)(void *))
+               int mode,
+               void (*result_cb)(void *))
 {
        const Eina_List *l;
        const Eina_List *n;
        gesture_cb_s *cb;
        EINA_LIST_FOREACH_SAFE(cbs_list[mode], l, n, cb) {
                continue_if(NULL == cb);
-               if (result_cb != cb->result_cb) {
+               if (result_cb != cb->result_cb)
                        continue;
-               }
+
                cbs_list[mode] = eina_list_remove(cbs_list[mode], cb);
                free(cb);
                return;
index 2609cbd061e51e31281d61ff27ce68d99c50129b..e3d25a2c6653a0d59196551850e685469e9b50ba 100755 (executable)
@@ -105,10 +105,10 @@ static main_s main_info = {
        .safety_init_timer = NULL,
 };
 
-
+typedef w_home_error_e (*main_result_cb)(void *);
 
 typedef struct {
-       w_home_error_e (*result_cb)(void *);
+       main_result_cb result_cb;
        void *result_data;
 } main_cb_s;
 
@@ -131,7 +131,8 @@ static void _home_visibility_vconf_set(Eina_Bool val)
 
        ret = vconf_set_bool(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, val);
        if (ret != 0) {
-               _E("Failed to set vconfkey(%s) : %d", VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, ret);
+               _E("Failed to set vconfkey(%s) : %d",
+                               VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, ret);
        }
 }
 
@@ -143,13 +144,11 @@ static int _is_lcd_turned_on(void)
        if (main_info.is_lcd_on >= 0) {
                return main_get_info()->is_lcd_on;
        } else {
-               if (device_display_get_state(&val) < 0) {
+               if (device_display_get_state(&val) < 0)
                        _E("Failed to get DISPLAY STATE");
-               }
 
-               if (val == DISPLAY_STATE_NORMAL || val == DISPLAY_STATE_SCREEN_DIM) {
+               if (val == DISPLAY_STATE_NORMAL || val == DISPLAY_STATE_SCREEN_DIM)
                        return 1;
-               }
        }
 
        return 0;
@@ -169,7 +168,10 @@ static void _del_list(void *data)
 static inline char *_ltrim(char *str)
 {
        retv_if(NULL == str, NULL);
-       while (*str && (*str == ' ' || *str == '\t' || *str == '\n')) str ++;
+
+       while (*str && (*str == ' ' || *str == '\t' || *str == '\n'))
+               str++;
+
        return str;
 }
 
@@ -182,9 +184,8 @@ static inline int _rtrim(char *str)
        retv_if(NULL == str, 0);
 
        len = strlen(str);
-       while (--len >= 0 && (str[len] == ' ' || str[len] == '\n' || str[len] == '\t')) {
+       while (--len >= 0 && (str[len] == ' ' || str[len] == '\n' || str[len] == '\t'))
                str[len] = '\0';
-       }
 
        return len;
 }
@@ -262,7 +263,7 @@ static int _page_info_in_list(page_info_s *page_info, Eina_List *list)
 
        EINA_LIST_FOREACH_SAFE(list, l, ln, name) {
                continue_if(!name);
-               if(!strcmp(name, page_info->id)) return 1;
+               if (!strcmp(name, page_info->id)) return 1;
        }
 
        return 0;
@@ -278,8 +279,7 @@ static void _tts_cb(void *data, Evas_Object *obj, void *event_info)
        _W("Change TTS");
 
        if (0 == vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &val)
-                       && main_info.is_tts != val)
-       {
+                       && main_info.is_tts != val) {
                Evas_Object *scroller = NULL;
                Eina_List *page_info_list = NULL;
                page_info_s *page_info = NULL;
@@ -322,8 +322,8 @@ static void _tts_cb(void *data, Evas_Object *obj, void *event_info)
                        ret_if(!black_list);
 
                        EINA_LIST_FOREACH_SAFE(page_info_list, l, ln, page_info) {
-                               if(_page_info_in_list(page_info, white_list)) continue;
-                               if(_page_info_in_list(page_info, black_list)) {
+                               if (_page_info_in_list(page_info, white_list)) continue;
+                               if (_page_info_in_list(page_info, black_list)) {
                                        page_info_list = eina_list_remove(page_info_list, page_info);
                                        continue;
                                }
@@ -332,9 +332,8 @@ static void _tts_cb(void *data, Evas_Object *obj, void *event_info)
                        _destroy_tts_list(white_list);
                        _destroy_tts_list(black_list);
 
-                       if (W_HOME_ERROR_NONE != db_read_list(page_info_list)) {
+                       if (W_HOME_ERROR_NONE != db_read_list(page_info_list))
                                _E("Cannot write items into the DB");
-                       }
 
                        /* If TTS is on, use focus & do not use the enhanced scroller. */
                        elm_object_tree_focus_allow_set(main_info.layout, EINA_TRUE);
@@ -404,16 +403,15 @@ HAPI void main_inc_booting_state(void)
         *  Cleaning must be performed only once after application loading in hidden condition
         *  (and stay in a hidden condition at time of cleaning).
         */
-       if (APP_STATE_PAUSE == main_info.state) {
+       if (APP_STATE_PAUSE == main_info.state)
                ecore_timer_add(5.0f, _appcore_flush_cb, NULL);
-       }
 }
 
 
 
 HAPI void main_dec_booting_state(void)
 {
-    main_info.booting_state--;
+       main_info.booting_state--;
 }
 
 
@@ -427,7 +425,7 @@ HAPI int main_get_booting_state(void)
 
 HAPI w_home_error_e main_register_cb(
                int state,
-               w_home_error_e (*result_cb)(void *), void *result_data)
+               main_result_cb result_cb, void *result_data)
 {
        main_cb_s *cb = NULL;
 
@@ -449,7 +447,7 @@ HAPI w_home_error_e main_register_cb(
 
 HAPI void main_unregister_cb(
                int state,
-               w_home_error_e (*result_cb)(void *))
+               main_result_cb result_cb)
 {
        const Eina_List *l;
        const Eina_List *n;
@@ -538,9 +536,8 @@ void app_resume(void *data)
        scroller = _scroller_get();
        if (scroller) {
                focused_page = scroller_get_focused_page(scroller);
-               if (focused_page != NULL && focused_page == main_info.clock_focus) {
+               if (focused_page != NULL && focused_page == main_info.clock_focus)
                        _home_visibility_vconf_set(EINA_TRUE);
-               }
        }
 
        apps_resume();
@@ -578,9 +575,8 @@ static void _setup_wizard_cb(keynode_t *node, void *data)
        const char *file = NULL;
        int setup_wizard = 1;
 
-       if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &setup_wizard) < 0) {
+       if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &setup_wizard) < 0)
                _E("Failed to get VCONFKEY_SETUP_WIZARD_STATE");
-       }
 
        if (setup_wizard) {
                _W("Setup wizard is still on");
@@ -612,13 +608,13 @@ static void _setup_wizard_cb(keynode_t *node, void *data)
                return;
        }
 
-       if (W_HOME_ERROR_NONE != db_read_list(page_info_list)) {
+       if (W_HOME_ERROR_NONE != db_read_list(page_info_list))
                _E("Cannot write items into the DB");
-       }
 
        layout_info = evas_object_data_get(main_info.layout, DATA_KEY_LAYOUT_INFO);
        if (layout_info) {
-               scroller_push_pages(layout_info->scroller, page_info_list, _del_list, page_info_list);
+               scroller_push_pages(layout_info->scroller,
+                               page_info_list, _del_list, page_info_list);
        }
 }
 
@@ -646,15 +642,14 @@ static Eina_Bool _widget_load_init_timer_cb(void *data)
 
                main_info.first_boot = 0;
 
-               if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &setup_wizard) < 0) {
+               if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &setup_wizard) < 0)
                        _E("Failed to get VCONFKEY_SETUP_WIZARD_STATE");
-               }
 
                if (setup_wizard) {
                        _W("Setup wizard is still on");
-                       if (vconf_notify_key_changed(VCONFKEY_SETUP_WIZARD_STATE, _setup_wizard_cb, NULL) < 0) {
+                       if (vconf_notify_key_changed(VCONFKEY_SETUP_WIZARD_STATE, _setup_wizard_cb, NULL) < 0)
                                _E("Failed to register the setup_wizard callback");
-                       }
+
                        return ECORE_CALLBACK_CANCEL;
                }
 
@@ -680,9 +675,8 @@ static Eina_Bool _widget_load_init_timer_cb(void *data)
                        return ECORE_CALLBACK_CANCEL;
                }
 
-               if (W_HOME_ERROR_NONE != db_read_list(page_info_list)) {
+               if (W_HOME_ERROR_NONE != db_read_list(page_info_list))
                        _E("Cannot write items into the DB");
-               }
        } else {
                _W("Read DB for initial list");
                page_info_list = db_write_list();
@@ -690,7 +684,8 @@ static Eina_Bool _widget_load_init_timer_cb(void *data)
 
        layout_info = evas_object_data_get(main_info.layout, DATA_KEY_LAYOUT_INFO);
        if (layout_info) {
-               scroller_push_pages(layout_info->scroller, page_info_list, _del_list, page_info_list);
+               scroller_push_pages(layout_info->scroller,
+                               page_info_list, _del_list, page_info_list);
        }
 
        return ECORE_CALLBACK_CANCEL;
@@ -739,9 +734,9 @@ static Eina_Bool _visibility_timeout_cb(void *data)
 
 static void _window_visibility_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       if (!main_info.win) {
+       if (!main_info.win)
                return;
-       }
+
        if (main_info.is_service_initialized == 0) {
                if (main_info.safety_init_timer) {
                        /**
@@ -778,9 +773,8 @@ static void _window_visibility_cb(void *data, Evas_Object *obj, void *event_info
 
 static void _window_focus_in_cb(void *data, Evas *e, void *event_info)
 {
-       if (!main_info.win) {
+       if (!main_info.win)
                return;
-       }
 
        _D("focus in");
        app_resume(NULL);
@@ -792,11 +786,8 @@ static void _window_focus_in_cb(void *data, Evas *e, void *event_info)
 
 static void _window_focus_out_cb(void *data, Evas *e, void *event_info)
 {
-
-       if (!main_info.win) {
+       if (!main_info.win)
                return;
-       }
-
 
        _D("focus out");
        app_pause(NULL);
@@ -884,9 +875,8 @@ static void _lcd_off_cb(void *user_data, void *event_info)
                widget_viewer_evas_notify_paused_status_of_viewer();
        }
 
-       if (moments_get_visible()) {
+       if (moments_get_visible())
                moments_hide();
-       }
 }
 
 
@@ -897,9 +887,9 @@ static void _check_lang(void)
        char *lang = NULL;
 
        lang = vconf_get_str(VCONFKEY_LANGSET);
-       if (!lang) {
+       if (!lang)
                return;
-       }
+
        elm_language_set(lang);
 
        free(lang);
@@ -923,9 +913,8 @@ bool app_create(void *data)
        main_info.state = APP_STATE_CREATE;
        evas_object_add_viewer_init();
 
-       if (vconf_notify_key_changed(VCONF_KEY_WMS_APPS_ORDER, _change_apps_order_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONF_KEY_WMS_APPS_ORDER, _change_apps_order_cb, NULL) < 0)
                _E("Failed to register the changed_apps_order callback");
-       }
 
        main_info.win = win_create("W-Home");
        retv_if(!main_info.win, false);
@@ -984,9 +973,9 @@ bool app_create(void *data)
         * workaround: when window visibiltiy cb isn't called
         */
        main_info.safety_init_timer = ecore_timer_add(VISIBILITY_TIMEOUT, _visibility_timeout_cb, NULL);
-       if (!main_info.safety_init_timer) {
+       if (!main_info.safety_init_timer)
                _E("Failed to create a fallback init timer for safety");
-       }
+
        /**
         * Dead callback should be called after initialize all services.
         * So we should register this at the last of this function.
@@ -994,13 +983,11 @@ bool app_create(void *data)
        aul_listen_app_dead_signal(_dead_cb, NULL);
 
        layout_info_s *layout_info = evas_object_data_get(main_info.layout, DATA_KEY_LAYOUT_INFO);
-       if (layout_info && layout_info->scroller) {
+       if (layout_info && layout_info->scroller)
                moments_init(main_info.win, layout_info->scroller);
-       }
 
-       if (apps_init() != ERROR_NONE) {
+       if (apps_init() != ERROR_NONE)
                _E("Failed to intialize apps");
-       }
 
        return true;
 }
@@ -1059,7 +1046,7 @@ void app_terminate(void *data)
         * DBUS fini
         * Gesture fini
         * calling sequence is meaningful
-       */
+        */
        home_gesture_fini();
 
        bg_destroy(main_info.win);
@@ -1105,9 +1092,8 @@ static Evas_Object *_layout_get(void)
 {
        Evas_Object *layout = NULL;
 
-       if (!main_info.win) {
+       if (!main_info.win)
                return NULL;
-       }
 
        layout = evas_object_data_get(main_info.win, DATA_KEY_LAYOUT);
 
@@ -1130,7 +1116,7 @@ bool main_is_clock_focused()
        Evas_Object *focused_page = NULL;
 
        if (main_info.state == APP_STATE_RESUME ||
-               main_info.state == APP_STATE_WIN_ACTIVATED) {
+                       main_info.state == APP_STATE_WIN_ACTIVATED) {
                scroller = _scroller_get();
                focused_page = scroller_get_focused_page(scroller);
                return main_info.clock_focus == focused_page;
@@ -1160,19 +1146,18 @@ void app_control(app_control_h service, void *data)
                                        apps_key_handler_press_home_key();
                                        apps_hide();
                                } else {
-                               /* Noti is exist on the clock */
+                                       /* Noti is exist on the clock */
                                }
                        /* CLOCK */
                        } else if (focused_page == main_info.clock_focus) {
-                               if (moments_get_visible()) {
+                               if (moments_get_visible())
                                        moments_hide();
-                               } else if (moments_control_get_do_not_disturb_popup_visible() == true) {
+                               else if (moments_control_get_do_not_disturb_popup_visible() == true)
                                        moments_control_do_not_disturb_popup_close();
-                               } else if (moments_control_get_flight_mode_popup_visible() == true) {
+                               else if (moments_control_get_flight_mode_popup_visible() == true)
                                        moments_control_flight_mode_popup_close();
-                               } else {
+                               else
                                        apps_show();
-                               }
                        }
                        key_cb_execute(KEY_TYPE_HOME);
                } else if (!strncmp(service_val, HOME_SERVICE_VALUE_POWERKEY_UNFOCUSED, strlen(HOME_SERVICE_VALUE_POWERKEY_UNFOCUSED))) {
index 0f26c80a25c90c6f1d9d7859f5d7bf6ddd3bc7f8..a05a369d5609c04d4d9a482acce1187413eee838 100755 (executable)
@@ -131,11 +131,10 @@ HAPI void index_bring_in_page(Evas_Object *index, Evas_Object *page)
        }
 
        idx_it = elm_index_item_find(index, (void *) idx);
-       if (idx_it) {
+       if (idx_it)
                elm_index_item_selected_set(idx_it, EINA_TRUE);
-       } else {
+       else
                _E("Critical, the index(%p) cannot find the page(%p:%d)", index, page, idx);
-       }
 }
 
 
@@ -172,19 +171,16 @@ HAPI void multi_index_bring_in_page(struct index_st *index, Evas_Object *page)
        }
        if (!found) {
                for (i = 0; i < inserted_count; i++)
-               {
                        elm_object_signal_emit(index->unit[i], "show", "index");
-               }
+
                return;
        }
 
-       for (i = 0; i < inserted_count; i++)
-       {
-               if (idx == i) {
+       for (i = 0; i < inserted_count; i++) {
+               if (idx == i)
                        elm_object_signal_emit(index->unit[i], "selected", "index");
-               } else {
+               else
                        elm_object_signal_emit(index->unit[i], "show", "index");
-               }
        }
 }
 
@@ -267,8 +263,7 @@ HAPI struct index_st *multi_index_create(Evas_Object *layout, Evas_Object *scrol
                size = INDICATOR_UNIT_SIZE;
        }
 
-       for (i = 0; i < count; i++)
-       {
+       for (i = 0; i < count; i++) {
                int ret;
                index->unit[i] = elm_layout_add(scroller);
                if (!index->unit[i]) {
@@ -424,9 +419,8 @@ static void _update_left(Evas_Object *scroller, struct index_st *index, const Ei
        /* 1. Make indexes (cur/center/other) */
        total_inserted = scroller_count_direction(scroller, PAGE_DIRECTION_LEFT);
 
-       if (total_inserted > INDICATOR_MAX_COUNT) {
+       if (total_inserted > INDICATOR_MAX_COUNT)
                total_inserted = INDICATOR_MAX_COUNT;
-       }
 
        for (i = 0; i < MAX_WIDGET; i++) {
                Evas_Object *indi_unit = NULL;
@@ -470,9 +464,9 @@ static void _update_left(Evas_Object *scroller, struct index_st *index, const Ei
                        page_index = calloc(1, sizeof(page_index_s));
                        continue_if(!page_index);
 
-                       if (page_index_inserting < INDICATOR_MAX_COUNT - 1) {
+                       if (page_index_inserting < INDICATOR_MAX_COUNT - 1)
                                page_index_inserting++;
-                       }
+
                        page_index->page = page;
                        page_index->index = page_index_inserting;
 
@@ -521,9 +515,8 @@ static void _update_right(Evas_Object *scroller, struct index_st *index, const E
        /* 1. Make indexes (cur/center/other) */
        total_inserted = scroller_count_direction(scroller, PAGE_DIRECTION_RIGHT);
 
-       if (total_inserted > INDICATOR_MAX_COUNT) {
+       if (total_inserted > INDICATOR_MAX_COUNT)
                total_inserted = INDICATOR_MAX_COUNT;
-       }
 
        for (i = 0; i < MAX_WIDGET; i++) {
                Evas_Object *indi_unit = NULL;
@@ -607,9 +600,8 @@ static void _update_center(Evas_Object *scroller, struct index_st *index, const
        /* 1. Make indexes (cur/center/other) */
        total_inserted = scroller_count_direction(scroller, PAGE_DIRECTION_CENTER);
 
-       if (total_inserted > INDICATOR_MAX_COUNT) {
+       if (total_inserted > INDICATOR_MAX_COUNT)
                total_inserted = INDICATOR_MAX_COUNT;
-       }
 
        for (i = 0; i < total_inserted; i++) {
                Evas_Object *clock_unit = NULL;
@@ -618,9 +610,9 @@ static void _update_center(Evas_Object *scroller, struct index_st *index, const
                else evas_object_move(index->unit[i], WIDGET_OUTSIDE_X, WIDGET_OUTSIDE_Y);
        }
 
-       for (i = 0; i < total_inserted; i++)
-       {
-               elm_object_part_content_set(scroller_info->indicator_layout, "clock_indicator", index->unit[cur_inserted]);
+       for (i = 0; i < total_inserted; i++) {
+               elm_object_part_content_set(scroller_info->indicator_layout,
+                               "clock_indicator", index->unit[cur_inserted]);
        }
 
        /* 2. Make a new page_index_list */
@@ -684,9 +676,8 @@ static void _update_single_index(Evas_Object *scroller, Evas_Object *index, cons
        total_count = scroller_count(scroller);
        total_inserted = scroller_count_direction(scroller, PAGE_DIRECTION_RIGHT);
 
-       if (total_inserted > MAX_INDEX_NUMBER) {
+       if (total_inserted > MAX_INDEX_NUMBER)
                total_inserted = MAX_INDEX_NUMBER;
-       }
 
        int style_even = 0;
        int style_base = 0;
@@ -705,9 +696,8 @@ static void _update_single_index(Evas_Object *scroller, Evas_Object *index, cons
                continue_if(!page_info);
 
                if (index_number < total_inserted) {
-                       if (!cur_inserted) {
+                       if (!cur_inserted)
                                cur_start_idx = index_number;
-                       }
 
                        cur_inserted++;
                        idx_it = elm_index_item_append(index, NULL, NULL, (void *) index_number);
@@ -735,11 +725,10 @@ static void _update_single_index(Evas_Object *scroller, Evas_Object *index, cons
 
                if (before_direction == page_info->direction) {
                        if (index_info->direction == page_info->direction) {
-                               if (page_index_inserting == cur_mid_idx && extra_idx > 0) {
+                               if (page_index_inserting == cur_mid_idx && extra_idx > 0)
                                        extra_idx--;
-                               } else {
+                               else
                                        page_index_inserting++;
-                               }
                        }
                } else {
                        before_direction = page_info->direction;
@@ -775,16 +764,14 @@ HAPI void multi_index_update(Evas_Object *scroller)
        list = elm_box_children_get(scroller_info->box);
        ret_if(!list);
 
-       for (i = 0; i < PAGE_DIRECTION_ANY; i++)
-       {
+       for (i = 0; i < PAGE_DIRECTION_ANY; i++) {
                index = scroller_info->index[i];
-               if (PAGE_DIRECTION_LEFT == index->index_info->direction) {
+               if (PAGE_DIRECTION_LEFT == index->index_info->direction)
                        _update_left(scroller, index, list);
-               } else if (PAGE_DIRECTION_RIGHT == index->index_info->direction) {
+               else if (PAGE_DIRECTION_RIGHT == index->index_info->direction)
                        _update_right(scroller, index, list);
-               } else {
+               else
                        _update_center(scroller, index, list);
-               }
        }
 
        eina_list_free(list);
@@ -827,4 +814,4 @@ HAPI void index_update(Evas_Object *index, Evas_Object *scroller, index_bring_in
 }
 
 
- // End of file
+// End of file
index 24c9224e311a39388d493501bae8ff340933195e..a754e79517da3e52738c3ca0823e2f856fd3c142 100644 (file)
@@ -48,9 +48,8 @@ HAPI item_info_s *item_info_create(const char *id, const char *subid)
                }
        }
 
-       if (id && item_info_is_removable(id)) {
+       if (id && item_info_is_removable(id))
                item_info->removable = 1;
-       }
 
        return item_info;
 }
index 0444a7249b763c70c68aa4c7811c15496d746b31..b41303f997697eda6874f0907609bd94a311200e 100755 (executable)
--- a/src/key.c
+++ b/src/key.c
@@ -55,17 +55,16 @@ static struct {
 };
 
 
-
 typedef struct {
-       key_cb_ret_e (*result_cb)(void *);
+       key_cb_result_fn result_cb;
        void *result_data;
 } key_cb_s;
 
 
 
 HAPI w_home_error_e key_register_cb(
-       int type,
-       key_cb_ret_e (*result_cb)(void *), void *result_data)
+               int type,
+               key_cb_result_fn result_cb, void *result_data)
 {
        retv_if(NULL == result_cb, W_HOME_ERROR_INVALID_PARAMETER);
 
@@ -84,8 +83,8 @@ HAPI w_home_error_e key_register_cb(
 
 
 HAPI void key_unregister_cb(
-       int type,
-       key_cb_ret_e (*result_cb)(void *))
+               int type,
+               key_cb_result_fn result_cb)
 {
        const Eina_List *l;
        const Eina_List *n;
@@ -128,17 +127,15 @@ static Eina_Bool _key_release_cb(void *data, int type, void *event)
 
        _D("Key(%s) released %d", ev->keyname, key_info.pressed);
 
-       if (key_info.pressed == EINA_FALSE) {
+       if (key_info.pressed == EINA_FALSE)
                return ECORE_CALLBACK_PASS_ON;
-       }
 
-       if (!strcmp(ev->keyname, "XF86Back")) {
+       if (!strcmp(ev->keyname, "XF86Back"))
                _execute_cbs(KEY_TYPE_BACK);
-       } else if (!strcmp(ev->keyname, "XF86Menu")) {
+       else if (!strcmp(ev->keyname, "XF86Menu"))
                _execute_cbs(KEY_TYPE_BEZEL_UP);
-       } else if (!strcmp(ev->keyname, "XF86PowerOff")) {
+       else if (!strcmp(ev->keyname, "XF86PowerOff"))
                _execute_cbs(KEY_TYPE_ROTARY);
-       }
 
        key_info.pressed = EINA_FALSE;
 
@@ -168,21 +165,18 @@ HAPI void key_register(void)
 {
        if (!key_info.release_handler) {
                key_info.release_handler = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_release_cb, NULL);
-               if (!key_info.release_handler) {
+               if (!key_info.release_handler)
                        _E("Failed to register a key up event handler");
-               }
        }
 
        if (!key_info.press_handler) {
                key_info.press_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _key_press_cb, NULL);
-               if (!key_info.press_handler) {
+               if (!key_info.press_handler)
                        _E("Failed to register a key down event handler");
-               }
        }
 
-       if (elm_win_keygrab_set(main_get_info()->win, "XF86Menu", 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST) != 0) {
+       if (elm_win_keygrab_set(main_get_info()->win, "XF86Menu", 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST) != 0)
                _E("Failed to grab KEY_MENU");
-       }
 
        key_info.pressed = EINA_FALSE;
        key_info.register_handler = EINA_TRUE;
@@ -207,9 +201,8 @@ HAPI void key_unregister(void)
                key_info.press_handler = NULL;
        }
 
-       if (elm_win_keygrab_unset(main_get_info()->win, "XF86Menu", 0, 0) != 0) {
+       if (elm_win_keygrab_unset(main_get_info()->win, "XF86Menu", 0, 0) != 0)
                _E("Failed to ungrab KEY_MENU");
-       }
 
        key_info.register_handler = EINA_FALSE;
 }
index 52066c203b15537afc67184073f166f5084576bc..9f0293014e16b4142e73c5efbce7731c98ab9340 100644 (file)
@@ -32,8 +32,10 @@ typedef struct {
        int domain;
 } lang_element;
 
+typedef w_home_error_e (*lang_result_cb)(void *);
+
 typedef struct {
-       w_home_error_e (*result_cb)(void *);
+       lang_result_cb result_cb;
        void *result_data;
 } lang_cb_s;
 
@@ -82,7 +84,7 @@ HAPI void lang_remove_id(Evas_Object *obj, const char *group)
 
 
 
-HAPI w_home_error_e lang_register_cb(w_home_error_e (*result_cb)(void *), void *result_data)
+HAPI w_home_error_e lang_register_cb(lang_result_cb result_cb, void *result_data)
 {
        retv_if(NULL == result_cb, W_HOME_ERROR_INVALID_PARAMETER);
 
@@ -100,7 +102,7 @@ HAPI w_home_error_e lang_register_cb(w_home_error_e (*result_cb)(void *), void *
 
 
 
-HAPI void lang_unregister_cb(w_home_error_e (*result_cb)(void *))
+HAPI void lang_unregister_cb(lang_result_cb result_cb)
 {
        const Eina_List *l;
        const Eina_List *n;
@@ -124,11 +126,10 @@ HAPI void lang_refresh_ids(void)
        char *temp;
 
        EINA_LIST_FOREACH_SAFE(lang_list, l, n, le) {
-               if (le->domain) {
+               if (le->domain)
                        temp = dgettext("sys_string", le->id);
-               } else {
+               else
                        temp = _(le->id);
-               }
 
                elm_object_part_text_set(le->obj, le->group, temp);
        }
index 5dd0f3e0e34878bdfc6579bdae403475146f38d8..ad628cfa9b1a2c570fc62596a1a99f8944fbe6e9 100755 (executable)
@@ -88,9 +88,8 @@ static Evas_Object *_create_background(Evas_Object *layout, const char *path)
                return NULL;
        }
 
-       if (path == NULL || !ecore_file_can_read(path)) {
+       if (path == NULL || !ecore_file_can_read(path))
                path = util_get_res_file_path(DEFAULT_WALLPAPER_IMAGE_PATH);
-       }
 
        if (elm_image_file_set(background, path, NULL) == EINA_FALSE) {
                _E("Failed to set backgound image file");
@@ -109,9 +108,8 @@ static void _set_wallpaper_path(Evas_Object *layout, const char *path)
 {
        Evas_Object *background = elm_object_part_content_unset(layout, "bg");
 
-       if (background) {
+       if (background)
                evas_object_del(background);
-       }
 
        background = _create_background(layout, path);
        if (background == NULL) {
@@ -175,9 +173,8 @@ static w_home_error_e _resume_result_cb(void *data)
                Evas_Object *scroller = NULL;
 
                layout = evas_object_data_get(main_get_info()->win, DATA_KEY_LAYOUT);
-               if (!layout) {
+               if (!layout)
                        return W_HOME_ERROR_FAIL;
-               }
 
                /* If TTS is on, use focus */
                if (main_get_info()->is_tts) {
@@ -186,9 +183,8 @@ static w_home_error_e _resume_result_cb(void *data)
                }
 
                scroller = evas_object_data_get(layout, DATA_KEY_SCROLLER);
-               if (!scroller) {
+               if (!scroller)
                        return W_HOME_ERROR_FAIL;
-               }
        }
 
        return W_HOME_ERROR_NONE;
@@ -255,10 +251,9 @@ static Eina_Bool _longpress_timer_cb(void *data)
                scroller_region_show_center_of(edit_info->scroller, proxy_page, SCROLLER_FREEZE_OFF, NULL, NULL, edit_minify_effect_page, effect_page);
                break;
        case PAGE_DIRECTION_CENTER:
-               if (util_feature_enabled_get(FEATURE_CLOCK_SELECTOR) == 1) {
-               } else {
+               if (util_feature_enabled_get(FEATURE_CLOCK_SELECTOR) != 1)
                        no_effect = 1;
-               }
+
                app_control_h app_control_handle = NULL;
                app_control_create(&app_control_handle);
                app_control_set_app_id(app_control_handle, "org.tizen.watch-setting");
@@ -287,18 +282,17 @@ static Eina_Bool _longpress_timer_cb(void *data)
 
                scroller_region_show_center_of(edit_info->scroller, proxy_page, SCROLLER_FREEZE_OFF, NULL, NULL, edit_minify_effect_page, effect_page);
 
-               if (layout_info->pressed_page == scroller_info->plus_page) {
+               if (layout_info->pressed_page == scroller_info->plus_page)
                        evas_object_data_set(layout_info->pressed_item, DATA_KEY_IS_LONGPRESS, (void *)1);
-               }
+
                break;
        default:
                _D("Cannot reach here");
                break;
        }
 
-       if (no_effect == 0) {
+       if (no_effect == 0)
                effect_play_vibration();
-       }
 
        return ECORE_CALLBACK_CANCEL;
 }
@@ -330,12 +324,12 @@ static void __layout_mouse_down(Evas_Object *layout, int down_x, int down_y)
                return ;
        }
 
-       if ((down_x <= LONGPRESS_GRAY_ZONE_W) || (down_x >= (main_get_info()->root_w - LONGPRESS_GRAY_ZONE_W))) {
+       if ((down_x <= LONGPRESS_GRAY_ZONE_W) || (down_x >= (main_get_info()->root_w - LONGPRESS_GRAY_ZONE_W)))
                is_gray_zone = 1;
-       }
-       if ((down_y <= LONGPRESS_GRAY_ZONE_H) || (down_y >= (main_get_info()->root_h - LONGPRESS_GRAY_ZONE_H))) {
+
+       if ((down_y <= LONGPRESS_GRAY_ZONE_H) || (down_y >= (main_get_info()->root_h - LONGPRESS_GRAY_ZONE_H)))
                is_gray_zone = 1;
-       }
+
        if (is_gray_zone == 1) {
                _W("we don't add a longpress timer, it's too close to home key");
                return;
@@ -437,31 +431,26 @@ static void _bezel_up_cb(void *data)
        scroller = evas_object_data_get(layout, DATA_KEY_SCROLLER);
        ret_if(!scroller);
 
-       if (PAGE_DIRECTION_CENTER != scroller_get_current_page_direction(scroller)) {
+       if (PAGE_DIRECTION_CENTER != scroller_get_current_page_direction(scroller))
                return;
-       }
 
        if (util_feature_enabled_get(FEATURE_APPS) == 0) {
                elm_object_signal_emit(layout, "bottom,show", "layout");
                return;
        }
 
-       if (util_feature_enabled_get(FEATURE_APPS_BY_BEZEL_UP) == 0) {
+       if (util_feature_enabled_get(FEATURE_APPS_BY_BEZEL_UP) == 0)
                return;
-       }
 
-       if (scroller_is_scrolling(scroller)) {
+       if (scroller_is_scrolling(scroller))
                return;
-       }
 
-       if (layout_is_edit_mode(layout)) {
+       if (layout_is_edit_mode(layout))
                return;
-       }
 
        focused_page = scroller_get_focused_page(scroller);
-       if (focused_page != NULL) {
+       if (focused_page != NULL)
                evas_object_data_set(focused_page, DATA_KEY_PAGE_ONHOLD_COUNT, (void*)1);
-       }
 
        apps_main_show_count_add();
        apps_main_launch(APPS_LAUNCH_SHOW);
@@ -553,11 +542,10 @@ Evas_Object *_get_proxy_page(Evas_Object *scroller)
 
                evas_object_geometry_get(obj, &x, NULL, &w, NULL);
                if (!w) continue;
-               if (x + w > half_line && x <= whole_line - pad) {
+               if (x + w > half_line && x <= whole_line - pad)
                        cur_page = obj;
-               } else if (x <= half_line && x >= pad) {
+               else if (x <= half_line && x >= pad)
                        cur_page = obj;
-               }
        }
 
        return cur_page;
@@ -668,9 +656,8 @@ static Evas_Event_Flags _flick_start_cb(void *data, void *event_info)
        retv_if(!layout, EVAS_EVENT_FLAG_NONE);
        retv_if(!ei, EVAS_EVENT_FLAG_NONE);
 
-       if (ei->momentum.y1 <= THRESHOLD_BEZEL_UP_H) {
+       if (ei->momentum.y1 <= THRESHOLD_BEZEL_UP_H)
                evas_object_data_set(layout, PRIVATE_DATA_KEY_READY_TO_BEZEL_DOWN, (void *) 1);
-       }
 
        return EVAS_EVENT_FLAG_NONE;
 }
@@ -688,16 +675,16 @@ static Evas_Event_Flags _flick_move_cb(void *data, void *event_info)
        int is_flickup_done = (int) evas_object_data_get(layout, PRIVATE_DATA_KEY_LAYOUT_G_FKICKUP_DONE);
        gesture_down_y = (int) evas_object_data_get(layout, PRIVATE_DATA_KEY_LAYOUT_G_DOWN_Y);
        int vector_y = ei->momentum.y2 - ei->momentum.y1;
-       int distance_x = abs( ei->momentum.x1 - ei->momentum.x2);
+       int distance_x = abs(ei->momentum.x1 - ei->momentum.x2);
        int distance_y = abs(vector_y);
 
        if (vector_y < 0 &&
-               (ei->momentum.my <= -THRESHOLD_MOMENTUM_FLICK_Y || distance_y >= THRESHOLD_BEZEL_UP_MOVE_D_H) &&
-               distance_x < distance_y) {
+                       (ei->momentum.my <= -THRESHOLD_MOMENTUM_FLICK_Y || distance_y >= THRESHOLD_BEZEL_UP_MOVE_D_H) &&
+                       distance_x < distance_y) {
                if (is_flickup_done == 0) {
-                       if (gesture_down_y >= (main_get_info()->root_h - THRESHOLD_BEZEL_UP_H)) {
+                       if (gesture_down_y >= (main_get_info()->root_h - THRESHOLD_BEZEL_UP_H))
                                gesture_execute_cbs(BEZEL_UP);
-                       }
+
                        evas_object_smart_callback_call(layout, LAYOUT_SMART_SIGNAL_FLICK_UP, layout);
                        evas_object_data_set(layout, PRIVATE_DATA_KEY_LAYOUT_G_FKICKUP_DONE, (void *) 1);
                }
@@ -735,21 +722,21 @@ static Evas_Event_Flags _flick_end_cb(void *data, void *event_info)
        int is_flickup_done = (int) evas_object_data_get(layout, PRIVATE_DATA_KEY_LAYOUT_G_FKICKUP_DONE);
        gesture_down_y = (int) evas_object_data_get(layout, PRIVATE_DATA_KEY_LAYOUT_G_DOWN_Y);
        int vector_y = ei->momentum.y2 - ei->momentum.y1;
-       int distance_x = abs( ei->momentum.x1 - ei->momentum.x2);
+       int distance_x = abs(ei->momentum.x1 - ei->momentum.x2);
        int distance_y = abs(vector_y);
 
        if (evas_object_data_del(layout, PRIVATE_DATA_KEY_READY_TO_BEZEL_DOWN)
-                               && (distance_x <= THRESHOLD_BEZEL_DOWN_X_DIST)) {
+                       && (distance_x <= THRESHOLD_BEZEL_DOWN_X_DIST)) {
                gesture_execute_cbs(BEZEL_DOWN);
        }
 
        if (vector_y < 0 &&
-               distance_y >= THRESHOLD_BEZEL_UP_END_D_H && //cannot use momentum
-               distance_x < distance_y) {
+                       distance_y >= THRESHOLD_BEZEL_UP_END_D_H && //cannot use momentum
+                       distance_x < distance_y) {
                if (is_flickup_done == 0) {
-                       if (gesture_down_y >= (main_get_info()->root_h - THRESHOLD_BEZEL_UP_H)) {
+                       if (gesture_down_y >= (main_get_info()->root_h - THRESHOLD_BEZEL_UP_H))
                                gesture_execute_cbs(BEZEL_UP);
-                       }
+
                        evas_object_smart_callback_call(layout, LAYOUT_SMART_SIGNAL_FLICK_UP, layout);
                        evas_object_data_set(layout, PRIVATE_DATA_KEY_LAYOUT_G_FKICKUP_DONE, (void *) 1);
                }
@@ -821,9 +808,9 @@ static key_cb_ret_e _back_key_cb(void *data)
        Evas_Object *layout = data;
        Evas_Object *scroller = NULL;
 
-       if (apps_is_visible()) {
+       if (apps_is_visible())
                return KEY_CB_RET_STOP;
-       }
+
        retv_if(!layout, KEY_CB_RET_CONTINUE);
 
        scroller = evas_object_data_get(layout, DATA_KEY_SCROLLER);
@@ -842,9 +829,9 @@ static key_cb_ret_e _home_key_cb(void *data)
        Evas_Object *layout = data;
        Evas_Object *scroller = NULL;
 
-       if (apps_is_visible()) {
+       if (apps_is_visible())
                return KEY_CB_RET_STOP;
-       }
+
        retv_if(!layout, KEY_CB_RET_CONTINUE);
 
        scroller = evas_object_data_get(layout, DATA_KEY_SCROLLER);
@@ -902,28 +889,22 @@ HAPI Evas_Object *layout_create(Evas_Object *win)
        evas_object_data_set(win, DATA_KEY_LAYOUT, layout);
        evas_object_data_set(layout, DATA_KEY_WIN, win);
 
-       if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_PAUSE, _pause_result_cb, layout)) {
+       if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_PAUSE, _pause_result_cb, layout))
                _E("Cannot register the pause callback");
-       }
 
-       if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_RESUME, _resume_result_cb, layout)) {
+       if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_RESUME, _resume_result_cb, layout))
                _E("Cannot register the resume callback");
-       }
 
-       if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_RESET, _reset_result_cb, layout)) {
+       if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_RESET, _reset_result_cb, layout))
                _E("Cannot register the reset callback");
-       }
 
 #if 0
-       if (W_HOME_ERROR_NONE != gesture_register_cb(BEZEL_UP, _bezel_up_cb, layout)) {
+       if (W_HOME_ERROR_NONE != gesture_register_cb(BEZEL_UP, _bezel_up_cb, layout))
                _E("Cannot register the gesture callback");
-       }
-       if (W_HOME_ERROR_NONE != gesture_register_cb(BEZEL_DOWN, _bezel_down_cb, layout)) {
+       if (W_HOME_ERROR_NONE != gesture_register_cb(BEZEL_DOWN, _bezel_down_cb, layout))
                _E("Cannot register the gesture callback");
-       }
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BEZEL_UP, _bezel_up_key_cb, layout)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BEZEL_UP, _bezel_up_key_cb, layout))
                _E("Cannot register the key callback");
-       }
 #endif
 
        layout_add_mouse_cb(layout);
@@ -962,7 +943,7 @@ HAPI Evas_Object *layout_create(Evas_Object *win)
        _add_wallpaper_changed_cb(layout);
 
        /* Grid for Page Indicator */
-       indicator_layout= elm_layout_add(layout);
+       indicator_layout = elm_layout_add(layout);
        elm_layout_file_set(indicator_layout, FILE_INDICATOR_LAYOUT_EDJ, GROUP_INDICATOR_LAYOUT);
        evas_object_show(indicator_layout);
        elm_object_part_content_set(layout, "indicator_layout", indicator_layout);
@@ -977,22 +958,20 @@ HAPI Evas_Object *layout_create(Evas_Object *win)
        evas_object_resize(size_setter, main_get_info()->root_w, main_get_info()->root_h);
        elm_object_part_content_set(indicator_layout, "size_setter", size_setter);
 
-       for (i = 0; i < PAGE_DIRECTION_ANY; i++) {
+       for (i = 0; i < PAGE_DIRECTION_ANY; i++)
                scroller_info->index[i] = multi_index_create(layout, scroller, i);
-       }
+
        layout_hide_multi_index(scroller_info->indicator_layout);
 
        _attach_gesture_layer(layout);
 
        scroller_init_rotary(scroller);
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _back_key_cb, layout)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _back_key_cb, layout))
                _E("Cannot register the key callback");
-       }
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _home_key_cb, layout)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _home_key_cb, layout))
                _E("Cannot register the key callback");
-       }
 
        return layout;
 }
@@ -1019,26 +998,22 @@ HAPI void layout_destroy(Evas_Object *win)
        scroller_info = evas_object_data_get(scroller, DATA_KEY_SCROLLER_INFO);
        ret_if(!scroller_info);
 
-       if (scroller_info->index[PAGE_DIRECTION_LEFT]) {
+       if (scroller_info->index[PAGE_DIRECTION_LEFT])
                multi_index_destroy(scroller_info->index[PAGE_DIRECTION_LEFT]);
-       }
 
-       if (scroller_info->index[PAGE_DIRECTION_RIGHT]) {
+       if (scroller_info->index[PAGE_DIRECTION_RIGHT])
                multi_index_destroy(scroller_info->index[PAGE_DIRECTION_RIGHT]);
-       }
 
        scroller_pop_pages(scroller, PAGE_DIRECTION_ANY);
        scroller_destroy(layout);
 
        checker = evas_object_data_del(layout, PRIVATE_DATA_KEY_LEFT_CHECKER);
-       if (checker) {
+       if (checker)
                _destroy_checker(checker);
-       }
 
        checker = evas_object_data_del(layout, PRIVATE_DATA_KEY_RIGHT_CHECKER);
-       if (checker) {
+       if (checker)
                _destroy_checker(checker);
-       }
 
        main_unregister_cb(APP_STATE_PAUSE, _pause_result_cb);
        main_unregister_cb(APP_STATE_RESUME, _resume_result_cb);
@@ -1091,7 +1066,7 @@ HAPI int layout_is_edit_mode(Evas_Object *layout)
        layout_info = evas_object_data_get(layout, DATA_KEY_LAYOUT_INFO);
        retv_if(!layout_info, 0);
 
-       return layout_info->edit? 1 : 0;
+       return layout_info->edit ? 1 : 0;
 }
 
 
index 85a2f0e0d34fcec9823bc6b50543a1b916599c7e..b72e7bff95e63dda47be5f9ae1e563a50dba0a66 100755 (executable)
@@ -33,9 +33,8 @@ int main(int argc, char *argv[])
        ui_app_add_event_handler(&event_handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, app_language_changed, NULL);
 
        int ret = ui_app_main(argc, argv, &lifecycle_callback, NULL);
-       if (ret != APP_ERROR_NONE) {
+       if (ret != APP_ERROR_NONE)
                _E("app_main() is failed. err = %d", ret);
-       }
 
        return ret;
 }
index 247c5c5338e7e1d344dd2962222092e5c9b47636..b626e3348c7615be89bc6ce73ad2069c89706e72 100755 (executable)
@@ -36,9 +36,8 @@ HAPI Evas_Object *mapbuf_get_mapbuf(Evas_Object *obj)
        if (obj == NULL) return NULL;
 
        mapbuf = evas_object_data_get(obj, DATA_KEY_MAPBUF);
-       if (!mapbuf && evas_object_data_get(obj, DATA_KEY_PAGE)) {
+       if (!mapbuf && evas_object_data_get(obj, DATA_KEY_PAGE))
                mapbuf = obj;
-       }
 
        return mapbuf;
 }
@@ -52,9 +51,8 @@ HAPI Evas_Object *mapbuf_get_page(Evas_Object *obj)
        retv_if(NULL == obj, NULL);
 
        page = evas_object_data_get(obj, DATA_KEY_PAGE);
-       if (!page && evas_object_data_get(obj, DATA_KEY_MAPBUF)) {
+       if (!page && evas_object_data_get(obj, DATA_KEY_MAPBUF))
                page = obj;
-       }
 
        return page;
 }
@@ -67,9 +65,8 @@ HAPI void mapbuf_set_color(Evas_Object *obj, int a)
        ret_if(NULL == mapbuf);
 
        int i;
-       for (i = 0; i < 4; i ++) {
+       for (i = 0; i < 4; i++)
                elm_mapbuf_point_color_set(mapbuf, i, a, a, a, a);
-       }
 }
 
 
@@ -104,7 +101,7 @@ HAPI w_home_error_e mapbuf_enable(Evas_Object *obj, int force)
        }
 
        int cnt = (int)evas_object_data_get(mapbuf, PRIVATE_DATA_KEY_MAPBUF_ENABLED);
-       cnt ++;
+       cnt++;
        evas_object_data_set(mapbuf, PRIVATE_DATA_KEY_MAPBUF_ENABLED, (void*)cnt);
 
        if (cnt == 0) {
@@ -123,9 +120,8 @@ HAPI int mapbuf_is_enabled(Evas_Object *obj)
 {
        Evas_Object *mapbuf;
        mapbuf = mapbuf_get_mapbuf(obj);
-       if (!mapbuf) {
+       if (!mapbuf)
                return 0;
-       }
 
        return elm_mapbuf_enabled_get(mapbuf);
 }
@@ -151,12 +147,11 @@ HAPI int mapbuf_disable(Evas_Object *obj, int force)
 
        cnt = (int)evas_object_data_get(mapbuf, PRIVATE_DATA_KEY_MAPBUF_ENABLED);
        if (cnt == 0) {
-               if (elm_mapbuf_enabled_get(mapbuf)) {
+               if (elm_mapbuf_enabled_get(mapbuf))
                        elm_mapbuf_enabled_set(mapbuf, 0);
-               }
        }
 
-       cnt --;
+       cnt--;
        evas_object_data_set(mapbuf, PRIVATE_DATA_KEY_MAPBUF_ENABLED, (void*)cnt);
 
        return W_HOME_ERROR_NONE;
index 609f590d2b332fe86bc957ad7590cf48d07cc4e9..46485c6a52e885569802d5715769932f57bdc544 100755 (executable)
@@ -55,9 +55,8 @@ void moments_control_brightness_status_changed_cb(keynode_t *node, void *user_da
 void __t__set_moments_control_brightness_level(int level)
 {
        int ret = device_display_set_brightness(0, level);
-       if (ret != DEVICE_ERROR_NONE) {
+       if (ret != DEVICE_ERROR_NONE)
                _E("Fail to set brightness");
-       }
 }
 int __t__get_moments_control_brightness_level(void)
 {
index e4bb07f7a1ca2c47c97129635757d453ed63636f..54e98f64046cbd292fe5723b4a2ed81daf5d0326 100755 (executable)
@@ -39,9 +39,8 @@ extern control_info_t control_button_list[MOMENTS_CONTROLS_MAX];
 
 static void __do_not_disturb_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       if (evas_object_visible_get(s_info.do_not_disturb_popup) == false) {
+       if (evas_object_visible_get(s_info.do_not_disturb_popup) == false)
                return;
-       }
 
        if (s_info.do_not_disturb_popup) {
                elm_popup_dismiss(s_info.do_not_disturb_popup);
@@ -51,9 +50,8 @@ static void __do_not_disturb_popup_cancel_cb(void *data, Evas_Object *obj, void
 
 static void __do_not_disturb_popup_ok_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       if (evas_object_visible_get(s_info.do_not_disturb_popup) == false) {
+       if (evas_object_visible_get(s_info.do_not_disturb_popup) == false)
                return;
-       }
 
        vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, true);
 
@@ -122,9 +120,11 @@ void moments_control_do_not_disturb_status_changed_cb(keynode_t *node, void *use
 
        vconf_get_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, &is_do_not_disturb);
        if (is_do_not_disturb == false) {
-               elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_DO_NOT_DISTURB].button_layout, "control_bar_off", "control_bar");
+               elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_DO_NOT_DISTURB].button_layout,
+                               "control_bar_off", "control_bar");
        } else {
-               elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_DO_NOT_DISTURB].button_layout, "control_bar_on", "control_bar");
+               elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_DO_NOT_DISTURB].button_layout,
+                               "control_bar_on", "control_bar");
        }
 }
 
@@ -138,9 +138,8 @@ void moments_control_do_not_disturb_pressed_cb(void *data, Evas *e, Evas_Object
                __do_not_disturb_popup_view_create();
        } else {
                int ret = vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, false);
-               if (ret < 0) {
+               if (ret < 0)
                        _E("Failed to set vconfkey(%s) : %d", VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, ret);
-               }
        }
 }
 
@@ -151,8 +150,10 @@ void moments_control_do_not_disturb_popup_close(void)
 
 bool moments_control_get_do_not_disturb_popup_visible(void)
 {
-       if (s_info.do_not_disturb_popup != NULL && evas_object_visible_get(s_info.do_not_disturb_popup) == true)
+       if (s_info.do_not_disturb_popup != NULL
+                       && evas_object_visible_get(s_info.do_not_disturb_popup) == true) {
                return true;
+       }
 
        return false;
 }
@@ -178,17 +179,15 @@ void __t__moments_control_do_not_disturb_popup_ok_cb(void *data, Evas_Object *ob
 void __t__set_moments_control_do_not_disturb_state(bool state)
 {
        int ret = vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, state);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set vconfkey(%s) : %d", VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, ret);
-       }
 }
 bool __t__get_moments_control_do_not_disturb_state(void)
 {
        int state = 0;
        int ret = vconf_get_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, &state);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to get vconfkey(%s) : %d", VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, ret);
-       }
 
        return (bool)state;
 }
index 23e0452b249ab8a45ded66382bb79054c3f035d1..5c075ea000ce4c7e532221794d35e473bbf8776e 100755 (executable)
@@ -37,9 +37,8 @@ extern control_info_t control_button_list[MOMENTS_CONTROLS_MAX];
 
 static void __flight_mode_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       if (evas_object_visible_get(s_info.flight_mode_popup) == false) {
+       if (evas_object_visible_get(s_info.flight_mode_popup) == false)
                return;
-       }
 
        if (s_info.flight_mode_popup) {
                elm_popup_dismiss(s_info.flight_mode_popup);
@@ -49,14 +48,12 @@ static void __flight_mode_popup_cancel_cb(void *data, Evas_Object *obj, void *ev
 
 static void __flight_mode_popup_ok_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       if (evas_object_visible_get(s_info.flight_mode_popup) == false) {
+       if (evas_object_visible_get(s_info.flight_mode_popup) == false)
                return;
-       }
 
        int ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, true);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
-       }
 
        elm_popup_dismiss(s_info.flight_mode_popup);
        s_info.flight_mode_popup = NULL;
@@ -135,9 +132,8 @@ void moments_control_flight_mode_pressed_cb(void *data, Evas *e, Evas_Object *ob
                __flight_mode_popup_view_create();
        } else {
                int ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, false);
-               if (ret < 0) {
+               if (ret < 0)
                        _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
-               }
        }
 }
 
@@ -146,11 +142,10 @@ void moments_control_flight_mode_status_changed_cb(keynode_t *node, void *user_d
        int is_flight_mode = false;
 
        vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
-       if (is_flight_mode == false) {
+       if (is_flight_mode == false)
                elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_FLIGHT_MODE].button_layout, "control_bar_off", "control_bar");
-       } else {
+       else
                elm_object_signal_emit(control_button_list[MOMENTS_CONTROLS_FLIGHT_MODE].button_layout, "control_bar_on", "control_bar");
-       }
 }
 
 void moments_control_flight_mode_popup_close(void)
@@ -171,9 +166,8 @@ Evas_Object *__t__get_moments_control_flight_mode_popup_layout(void)
 void __t__set_moments_control_flight_mode_state(bool state)
 {
        int ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, state);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
-       }
 }
 bool __t__get_moments_control_flight_mode_state(void)
 {
index 3909d1df9dd99493347ee536ddebf510dcf949e9..a4afa7707e5aa647a6234ad7a335e2f617a972f1 100755 (executable)
@@ -47,9 +47,9 @@ static void __bluetooth_state_changed_cb(keynode_t *node, void *user_data);
 
 
 const char *controls_btn_group_name[MOMENTS_CONTROLS_BTN_TYPE_MAX] = {
-                                                                                                                                               CONTROLS_GROUP_ICON_ONLY,
-                                                                                                                                               CONTROLS_GROUP_ICON_AND_TEXT,
-                                                                                                                                               CONTROLS_GROUP_ICON_AND_BAR
+       CONTROLS_GROUP_ICON_ONLY,
+       CONTROLS_GROUP_ICON_AND_TEXT,
+       CONTROLS_GROUP_ICON_AND_BAR
 };
 
 control_info_t control_button_list[MOMENTS_CONTROLS_MAX] = {
@@ -174,9 +174,8 @@ static Evas_Object *__create_control_button(Evas_Object * base_layout, control_i
        elm_image_file_set(icon, full_path, NULL);
        elm_object_part_content_set(button_layout, CONTROLS_ICON, icon);
 
-       if (btn_info->btn_type == MOMENTS_CONTROLS_BTN_TYPE_ICON_AND_TEXT) {
+       if (btn_info->btn_type == MOMENTS_CONTROLS_BTN_TYPE_ICON_AND_TEXT)
                elm_object_part_text_set(button_layout, CONTROLS_TEXT, btn_info->volume_text);
-       }
 
        evas_object_event_callback_add(button_layout, EVAS_CALLBACK_MOUSE_UP, __control_button_up_cb, (void*)btn_info);
        evas_object_event_callback_add(button_layout, EVAS_CALLBACK_MOUSE_DOWN, __control_button_down_cb, NULL);
@@ -204,7 +203,7 @@ control_info_t *moments_control_create_button(Evas_Object *base_layout, int butt
        button->icon_image = control_button_list[button_id].icon_image;
        button->icon_status = control_button_list[button_id].icon_status;
        button->volume_text = control_button_list[button_id].volume_text;
-       button->more_opt_status= control_button_list[button_id].more_opt_status;
+       button->more_opt_status = control_button_list[button_id].more_opt_status;
        button->pressed = control_button_list[button_id].pressed;
        button->button_layout = __create_control_button(base_layout, button);
 
@@ -212,24 +211,24 @@ control_info_t *moments_control_create_button(Evas_Object *base_layout, int butt
 
        switch (button_id) {
        case MOMENTS_CONTROLS_DO_NOT_DISTURB:
-               if (vconf_notify_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, moments_control_do_not_disturb_status_changed_cb, NULL) < 0) {
+               if (vconf_notify_key_changed(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, moments_control_do_not_disturb_status_changed_cb, NULL) < 0)
                        _E("Failed to register the __do_not_disturb_status_changed_cb callback");
-               }
+
                break;
        case MOMENTS_CONTROLS_VOLUME:
-               if (sound_manager_set_volume_changed_cb(moments_control_volume_status_changed_cb, NULL) != SOUND_MANAGER_ERROR_NONE) {
+               if (sound_manager_set_volume_changed_cb(moments_control_volume_status_changed_cb, NULL) != SOUND_MANAGER_ERROR_NONE)
                        _E("Failed to register the __volume_status_changed_cb callback");
-               }
+
                break;
        case MOMENTS_CONTROLS_FLIGHT_MODE:
-               if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, moments_control_flight_mode_status_changed_cb, NULL) < 0) {
+               if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, moments_control_flight_mode_status_changed_cb, NULL) < 0)
                        _E("Failed to register the __flight_mode_status_changed_cb callback");
-               }
+
                break;
        case MOMENTS_CONTROLS_BRIGHTNESS:
-               if (vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, moments_control_brightness_status_changed_cb, NULL) < 0) {
+               if (vconf_notify_key_changed(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, moments_control_brightness_status_changed_cb, NULL) < 0)
                        _E("Failed to register the _brightness_status_changed_cb callback");
-               }
+
                break;
        default:
                break;
@@ -246,9 +245,8 @@ void moments_control_destroy_button(control_info_t *button_info)
                evas_object_event_callback_del(button_info->button_layout, EVAS_CALLBACK_MOUSE_MOVE, __control_button_move_cb);
 
                Evas_Object *icon = elm_object_part_content_get(button_info->button_layout, CONTROLS_ICON);
-               if (icon != NULL) {
+               if (icon != NULL)
                        evas_object_del(icon);
-               }
 
                switch (button_info->index) {
                case MOMENTS_CONTROLS_DO_NOT_DISTURB:
@@ -359,7 +357,7 @@ static void __set_state_3g_with_phone_connection(void)
        moments_control_clear_button_list();
 
        control_info_t *brightness_button = moments_control_create_button(s_info.control_layout, MOMENTS_CONTROLS_BRIGHTNESS);
-       moments_control_push_to_button_list(brightness_button );
+       moments_control_push_to_button_list(brightness_button);
 
        control_info_t *volume_button = moments_control_create_button(s_info.control_layout, MOMENTS_CONTROLS_VOLUME);
        moments_control_push_to_button_list(volume_button);
@@ -386,7 +384,7 @@ static void __set_state_bt_with_phone_connection(void)
        moments_control_clear_button_list();
 
        control_info_t *brightness_button = moments_control_create_button(s_info.control_layout, MOMENTS_CONTROLS_BRIGHTNESS);
-       moments_control_push_to_button_list(brightness_button );
+       moments_control_push_to_button_list(brightness_button);
 
        control_info_t *volume_button = moments_control_create_button(s_info.control_layout, MOMENTS_CONTROLS_VOLUME);
        moments_control_push_to_button_list(volume_button);
index d8e99bf6e3d91880d1d566920bc62ff621dbd505..9f704218b4af2971e0f952e968a78c5e789d5946 100755 (executable)
@@ -34,7 +34,7 @@ static int __get_current_device_volume_level()
 {
        int level = 0;
 
-       if(moments_check_is_3g_device()) {
+       if (moments_check_is_3g_device()) {
                sound_manager_get_volume(SOUND_TYPE_RINGTONE, &level);
                _D("ringtone volume value: %d", level);
        } else {
@@ -72,15 +72,13 @@ void moments_control_volume_pressed_cb(void *data, Evas *e, Evas_Object *obj, vo
 void __t__set_moments_control_volume_level(int level)
 {
        int ret = -1;
-       if(moments_check_is_3g_device()) {
+       if (moments_check_is_3g_device())
                ret = sound_manager_set_volume(SOUND_TYPE_RINGTONE, level);
-       } else {
+       else
                ret = sound_manager_set_volume(SOUND_TYPE_MEDIA, level);
-       }
 
-       if (ret != SOUND_MANAGER_ERROR_NONE) {
+       if (ret != SOUND_MANAGER_ERROR_NONE)
                _E("Fail to set volume");
-       }
 }
 int __t__get_moments_control_volume_level()
 {
index 2ab20c3b6d54f755d4303a4171e1e14cc1762ac1..34c10b2d96cfbfb0f6717004e94fdc8dc67b4010 100755 (executable)
@@ -121,9 +121,8 @@ bool moments_check_is_with_phone_via_bluetooth(void)
                        return false;
                }
 
-               if (sap_connected) {
+               if (sap_connected)
                        return true;
-               }
        }
 
        return false;
@@ -194,9 +193,8 @@ void moments_show(void)
 
        s_info.visible = true;
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, __back_key_cb, NULL)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, __back_key_cb, NULL))
                _E("Cannot register the key callback");
-       }
 }
 
 void moments_hide(void)
@@ -225,9 +223,8 @@ void moments_put_down(void)
 
 static key_cb_ret_e __back_key_cb(void *data)
 {
-       if (!s_info.visible) {
+       if (!s_info.visible)
                return KEY_CB_RET_CONTINUE;
-       }
 
        moments_hide();
 
@@ -340,11 +337,10 @@ static void __register_status_callback(void)
                        return;
                }
 
-               if (state == TELEPHONY_STATE_READY) {
+               if (state == TELEPHONY_STATE_READY)
                        __initialize_telephony_service();
-               } else {
+               else
                        ret = telephony_set_state_changed_cb(__telephony_state_changed_cb, NULL);
-               }
        }
        /* FLIGHT MODE */
        vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE, __flight_mode_changed_cb, NULL);
@@ -371,39 +367,32 @@ static void __unregister_status_callback(void)
                int ret = TELEPHONY_ERROR_NONE;
 
                ret = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_GPS_STATUS);
-               if (ret != RUNTIME_INFO_ERROR_NONE) {
+               if (ret != RUNTIME_INFO_ERROR_NONE)
                        _E("Failed to unregister location service state");
-               }
 
                ret = telephony_unset_noti_cb(handle_list.handle[0], TELEPHONY_NOTI_NETWORK_PS_TYPE);
-               if (ret != TELEPHONY_ERROR_NONE) {
+               if (ret != TELEPHONY_ERROR_NONE)
                        _E("Failed to unregister service state");
-               }
 
                ret = telephony_unset_noti_cb(handle_list.handle[0], TELEPHONY_NOTI_NETWORK_ROAMING_STATUS);
-               if (ret != TELEPHONY_ERROR_NONE) {
+               if (ret != TELEPHONY_ERROR_NONE)
                        _E("Failed to unregister roaming status");
-               }
 
                ret = telephony_unset_noti_cb(handle_list.handle[0], TELEPHONY_NOTI_NETWORK_SIGNALSTRENGTH_LEVEL);
-               if (ret != TELEPHONY_ERROR_NONE) {
+               if (ret != TELEPHONY_ERROR_NONE)
                        _E("Failed to unregister signal strength");
-               }
 
                ret = telephony_unset_noti_cb(handle_list.handle[0], TELEPHONY_NOTI_NETWORK_SERVICE_STATE);
-               if (ret != TELEPHONY_ERROR_NONE) {
+               if (ret != TELEPHONY_ERROR_NONE)
                        _E("Failed to unregister service state");
-               }
 
                ret = telephony_unset_noti_cb(handle_list.handle[0], TELEPHONY_NOTI_SIM_STATUS);
-               if (ret != TELEPHONY_ERROR_NONE) {
+               if (ret != TELEPHONY_ERROR_NONE)
                        _E("Failed to unregister sim status");
-               }
 
                ret = telephony_deinit(&handle_list);
-               if (ret != TELEPHONY_ERROR_NONE) {
+               if (ret != TELEPHONY_ERROR_NONE)
                        _E("Failed to deinitialize telephony");
-               }
 
                vconf_ignore_key_changed(VCONFKEY_DNET_STATE, __network_type_changed_cb);
                vconf_ignore_key_changed(VCONFKEY_TELEPHONY_CALL_FORWARD_STATE, __callforwarding_state_changed_cb);
@@ -430,13 +419,12 @@ static void __battery_state_changed_cb(device_callback_e type, void *value, void
        bool is_charging = 0;
 
        ret = device_battery_is_charging(&is_charging);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to get battery is charging");
-       }
+
        ret = device_battery_get_percent(&percent);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to get battery percent");
-       }
 
        converted_percent = __get_round_off_percent(percent);
 
@@ -546,7 +534,7 @@ static void __flight_mode_changed_cb(keynode_t *node, void *user_data)
                moments_status_bluetooth_icon_hide(); // device will be removed in this function
                moments_status_headset_icon_hide();
        } else {
-       // off
+               // off
                if (moments_check_is_3g_device() && s_info.telephony_initialized) {
                        __callsignal_enable();
                        __callforwarding_state_changed_cb(NULL, NULL);
@@ -572,9 +560,9 @@ static void __wifi_state_changed_cb(keynode_t *node, void *user_data)
 
        if (wifi_state == VCONFKEY_WIFI_CONNECTED) {
                _D("WIFI CONNECTED");
-               if (!moments_check_is_3g_device()) {
+               if (!moments_check_is_3g_device())
                        moments_status_network_icon_show();
-               }
+
                __get_wifi_strength_and_packet_type(&network_type, &packet_type);
                moments_status_network_update(network_type + MOMENT_STATUS_SIGNAL_WIFI_INDEX, packet_type+NETWORK_PACKET_INDEX_START);
        } else {
@@ -655,11 +643,10 @@ static void __callforwarding_state_changed_cb(keynode_t *node, void *user_data)
                return;
        }
 
-       if (state == VCONFKEY_TELEPHONY_CALL_FORWARD_ON) {
+       if (state == VCONFKEY_TELEPHONY_CALL_FORWARD_ON)
                moments_status_callforwarding_icon_show();
-       } else {
+       else
                moments_status_callforwarding_icon_hide();
-       }
 
        moments_status_update_view();
 }
@@ -705,9 +692,8 @@ static void __location_service_state_changed_cb(runtime_info_key_e key, void *da
 
        if (gps_status == RUNTIME_INFO_GPS_STATUS_CONNECTED) {
                _D("Location is available, Show LOCATION icon");
-               if (!is_flight) {
+               if (!is_flight)
                        moments_status_location_icon_show();
-               }
        } else {
                _D("Location is unavailable, Hide LOCATION icon");
                moments_status_location_icon_hide();
@@ -794,9 +780,8 @@ static int __get_round_off_percent(int real_percent)
        remainder = real_percent % 5;
        real_percent /= 5;
 
-       if (remainder > 2) {
+       if (remainder > 2)
                real_percent += 1;
-       }
 
        return real_percent * 5;
 }
index 2e78ab3b5bd39282f049ba65ccefa15eecb2ffb8..6bb0276fbecc0f867ded85b5a15ab3a5fd4a840c 100755 (executable)
@@ -160,9 +160,11 @@ void moments_status_battery_update(int percent, int converted_percent, bool is_c
        elm_object_signal_emit(s_info.status_battery, battery_icon, "icon_image");
 
        if (is_charging) {
-               elm_object_signal_emit(s_info.status_battery, "show_battery_charge", "battery_charge_image");
+               elm_object_signal_emit(s_info.status_battery,
+                               "show_battery_charge", "battery_charge_image");
        } else {
-               elm_object_signal_emit(s_info.status_battery, "hide_battery_charge", "battery_charge_image");
+               elm_object_signal_emit(s_info.status_battery,
+                               "hide_battery_charge", "battery_charge_image");
        }
 }
 
@@ -210,9 +212,8 @@ void moments_status_callsignal_update(int strength, bool is_roaming)
 
 void moments_status_network_icon_show(void)
 {
-       if (s_info.icon_array[STATUS_ICON_NETWORK]) {
+       if (s_info.icon_array[STATUS_ICON_NETWORK])
                return;
-       }
 
        s_info.icon_array[STATUS_ICON_NETWORK] = __create_network(s_info.status_layout);
 
@@ -237,11 +238,13 @@ void moments_status_network_update(int network_type, int packet_type)
        _D("Update network_type[%d], packet_type[%d]", network_type, packet_type);
 
        if (network_type >= 0) {
-               elm_object_signal_emit(s_info.icon_array[STATUS_ICON_NETWORK], __status_network_type_signal[network_type], "type_icon_image");
+               elm_object_signal_emit(s_info.icon_array[STATUS_ICON_NETWORK],
+                               __status_network_type_signal[network_type], "type_icon_image");
        }
 
        if (packet_type >= 0) {
-               elm_object_signal_emit(s_info.icon_array[STATUS_ICON_NETWORK], __status_network_type_signal[packet_type], "inout_icon_image");
+               elm_object_signal_emit(s_info.icon_array[STATUS_ICON_NETWORK],
+                               __status_network_type_signal[packet_type], "inout_icon_image");
        }
 }
 
@@ -318,15 +321,13 @@ void moments_status_bluetooth_update(int on_off, int connected)
        if (!on_off) {
                moments_status_bluetooth_icon_hide();
        } else {
-               if (!s_info.icon_array[STATUS_ICON_BLUETOOTH]) {
+               if (!s_info.icon_array[STATUS_ICON_BLUETOOTH])
                        moments_status_bluetooth_icon_show();
-               }
 
-               if (!connected) {
+               if (!connected)
                        elm_object_signal_emit(s_info.icon_array[STATUS_ICON_BLUETOOTH], "bt_disconnected", "bluetooth");
-               } else {
+               else
                        elm_object_signal_emit(s_info.icon_array[STATUS_ICON_BLUETOOTH], "bt_connected", "bluetooth");
-               }
        }
 }
 
@@ -380,11 +381,10 @@ void moments_status_update_view(void)
 
        __unpack_all_icons_from_grid();
 
-       if (moments_check_is_3g_device()) {
+       if (moments_check_is_3g_device())
                __pack_all_icons_to_3g_position();
-       } else {
+       else
                __pack_all_icons_to_bt_position();
-       }
 }
 
 static void __pack_all_icons_to_bt_position(void)
@@ -416,8 +416,7 @@ static void __pack_all_icons_to_3g_position(void)
 static void __unpack_all_icons_from_grid(void)
 {
        int i = 0;
-       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++)
-       {
+       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++) {
                Evas_Object *icon = __status_icon_list[i];
                if (icon) {
                        elm_grid_unpack(s_info.status_grid, icon);
@@ -430,21 +429,18 @@ static status_icon_type_e __get_prev_type_by_priority(status_icon_type_e type)
 {
        int i;
        status_icon_type_e prev_type = -1;
-       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++)
-       {
+       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++) {
                status_icon_type_e cur_type = -1;
-               if (moments_check_is_3g_device()) {
+               if (moments_check_is_3g_device())
                        cur_type = __status_icon_priority_3g[i];
-               } else if (!moments_check_is_3g_device() && i < STATUS_ICON_MAX_COUNT_BT) {
+               else if (!moments_check_is_3g_device() && i < STATUS_ICON_MAX_COUNT_BT)
                        cur_type = __status_icon_priority_bt[i];
-               }
 
                if (cur_type == type)
                        break;
 
-               if (__status_icon_is_appended[cur_type]) {
+               if (__status_icon_is_appended[cur_type])
                        prev_type = cur_type;
-               }
        }
 
        return prev_type;
@@ -476,11 +472,10 @@ static void __register_icon_type_to_list(status_icon_type_e type)
        if (moments_get_is_on_initialization()) {
                prev_type = __get_prev_type_by_priority(type);
 
-               if (prev_type < 0) {
+               if (prev_type < 0)
                        __prepend_icon_type_to_type_list(type);
-               } else {
+               else
                        __append_icon_type_to_type_list(type, prev_type);
-               }
        } else {
                __status_icon_type_list = eina_list_append(__status_icon_type_list, (void *)type);
        }
@@ -667,8 +662,7 @@ static void __remove_all_icons(void)
        __status_icon_type_list = eina_list_free(__status_icon_type_list);
 
        int i = 0;
-       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++)
-       {
+       for (i = 0; i < STATUS_ICON_MAX_COUNT; i++) {
                if (s_info.icon_array[i]) {
                        evas_object_del(s_info.icon_array[i]);
                        __status_icon_is_appended[i] = false;
index 779cf0c6c062bc6fdd6d2b6dae242d413d32e1b6..2d501c33ff42b016a493f85ce972fb6f224b8f68 100755 (executable)
@@ -67,15 +67,15 @@ static struct __view_s {
 };
 
 const char *center_layout_group_name[MOMENTS_CONNECTION_STATUS_MAX] = {
-                                                                                                                                               CENTER_GROUP_STATUS_STANDALONE,
-                                                                                                                                               CENTER_GROUP_STATUS_BLUETOOTH,
-                                                                                                                                               CENTER_GROUP_STATUS_REMOTELY
+       CENTER_GROUP_STATUS_STANDALONE,
+       CENTER_GROUP_STATUS_BLUETOOTH,
+       CENTER_GROUP_STATUS_REMOTELY
 };
 
 
 
 
-int controls_btn_pos[4][2] = { {110, 284}, {186, 284}, {45, 248}, {251, 248}};
+int controls_btn_pos[4][2] = { {110, 284}, {186, 284}, {45, 248}, {251, 248} };
 
 moments_connection_status_e connection_status = 0;
 
@@ -133,18 +133,19 @@ void moments_destroy_ui(void)
 {
        _D("%s", __func__);
 
-       if (s_info.control_layout) {
+       if (s_info.control_layout)
                evas_object_del(s_info.control_layout);
-       }
 
        evas_object_event_callback_del(s_info.background_layout, EVAS_CALLBACK_MOUSE_UP, __up_cb);
        evas_object_event_callback_del(s_info.background_layout, EVAS_CALLBACK_MOUSE_MOVE, __move_cb);
        evas_object_event_callback_del(s_info.background_layout, EVAS_CALLBACK_MOUSE_DOWN, __down_cb);
 
-       if (s_info.size_setter) evas_object_del(s_info.size_setter);
+       if (s_info.size_setter)
+               evas_object_del(s_info.size_setter);
        s_info.size_setter = NULL;
 
-       if (s_info.background_layout) evas_object_del(s_info.background_layout);
+       if (s_info.background_layout)
+               evas_object_del(s_info.background_layout);
        s_info.background_layout = NULL;
 
        moments_status_view_destroy();
@@ -157,9 +158,8 @@ bool moments_view_show(void)
        if (!s_info.background_layout) return false;
        if (!s_info.status_layout) return false;
 
-       if (animator_is_ongoing()) {
+       if (animator_is_ongoing())
                animator_stop();
-       }
 
        evas_object_show(s_info.background_layout);
        evas_object_show(s_info.status_layout);
@@ -190,9 +190,8 @@ bool moments_view_hide(void)
        if (!s_info.background_layout) return false;
        if (!s_info.status_layout) return false;
 
-       if (animator_is_ongoing()) {
+       if (animator_is_ongoing())
                animator_stop();
-       }
 
        int x, y, w, h;
        MOVEMENT movement_info[2];
@@ -224,11 +223,10 @@ void moments_view_move(int from_y, int to_y)
 
        __get_dest_y(from_y, to_y, &y);
 
-       if (y == OUTSIDE_Y) return ;
+       if (y == OUTSIDE_Y) return;
 
-       if (animator_is_ongoing()) {
+       if (animator_is_ongoing())
                animator_stop();
-       }
 
        evas_object_move(s_info.background_layout, 0, y);
 }
@@ -348,8 +346,8 @@ void moments_view_set_text_for_sim_available(telephony_h handle)
                break;
        }
 
-       if(plmn) free(plmn);
-       if(spn) free(spn);
+       if (plmn) free(plmn);
+       if (spn) free(spn);
 
        __set_plmn_text(buf);
 }
@@ -402,7 +400,8 @@ static Evas_Object *__create_center_layout(Evas_Object *base_layout)
        Evas_Object *center_layout = NULL;
 
        center_layout = elm_layout_add(base_layout);
-       if (!center_layout|| !elm_layout_file_set(center_layout, util_get_res_file_path(CENTER_LAYOUT_EDJE), CENTER_GROUP_STATUS_STANDALONE)) {
+       if (!center_layout
+                       || !elm_layout_file_set(center_layout, util_get_res_file_path(CENTER_LAYOUT_EDJE), CENTER_GROUP_STATUS_STANDALONE)) {
                _E("Failed to create center layout");
                goto __fail;
        }
@@ -438,7 +437,7 @@ static int __get_control_layout_alpha(int layout_bottom)
        double button_grid_alpha = 0;
        if (layout_bottom < MOMENT_BUTTON_VI_START_Y) button_grid_alpha = 0;
        else if (layout_bottom >= MOMENT_BUTTON_VI_END_Y) button_grid_alpha = 255;
-       else button_grid_alpha = 125.0 + ((double)layout_bottom - MOMENT_BUTTON_VI_START_Y) * (130.0 / ((double)MOMENT_BUTTON_VI_END_Y - MOMENT_BUTTON_VI_START_Y));
+       else button_grid_alpha = 125.0 + ((double)(layout_bottom - MOMENT_BUTTON_VI_START_Y)) * (130.0 / ((double)(MOMENT_BUTTON_VI_END_Y - MOMENT_BUTTON_VI_START_Y)));
 
        return (int)button_grid_alpha;
 }
@@ -448,7 +447,7 @@ static int __get_center_layout_alpha(int layout_bottom)
        double button_grid_alpha = 0;
        if (layout_bottom < MOMENT_CENTER_VI_START_Y) button_grid_alpha = 0;
        else if (layout_bottom >= MOMENT_CENTER_VI_END_Y) button_grid_alpha = 255;
-       else button_grid_alpha = 155.0 + ((double)layout_bottom - MOMENT_CENTER_VI_START_Y) * (100.0 / ((double)MOMENT_CENTER_VI_END_Y - MOMENT_CENTER_VI_START_Y));
+       else button_grid_alpha = 155.0 + ((double)(layout_bottom - MOMENT_CENTER_VI_START_Y)) * (100.0 / ((double)(MOMENT_CENTER_VI_END_Y - MOMENT_CENTER_VI_START_Y)));
 
        return (int)button_grid_alpha;
 }
@@ -465,16 +464,15 @@ static void __adjust_content_alpha(void *data, Evas *e, Evas_Object *obj, void *
 
 static void __put_down(void)
 {
-       if (animator_is_ongoing()) {
+       if (animator_is_ongoing())
                animator_stop();
-       }
 
        int x, y, w, h;
        MOVEMENT movement_info[2];
        evas_object_geometry_get(s_info.background_layout, &x, &y, &w, &h);
 
        bool is_short_drag_down = y < (-WINDOW_H + MOMENTS_INIT_H + MOMENT_DRAW_LIMIT);
-       bool is_drag_up = s_info.is_show && y < (- MOMENT_DRAW_LIMIT);
+       bool is_drag_up = s_info.is_show && y < (-MOMENT_DRAW_LIMIT);
 
        if (is_short_drag_down || is_drag_up) {
                moments_hide();
@@ -567,10 +565,8 @@ static void __background_layout_mouse_move(int cur_x, int cur_y)
                return ;
        }
 
-       if ((s_info.down_y - cur_y) > MOMENT_DRAW_LIMIT) {
+       if ((s_info.down_y - cur_y) > MOMENT_DRAW_LIMIT)
                s_info.is_drawing_up = true;
-       }
-
 }
 
 static void __move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -587,9 +583,8 @@ static void __background_layout_mouse_up(int up_x, int up_y)
 {
        s_info.down_y = -1;
 
-       if (!s_info.is_drawing_up) {
+       if (!s_info.is_drawing_up)
                return ;
-       }
 
        s_info.is_drawing_up = false;
 
@@ -618,7 +613,7 @@ static void __get_draw_up_view_y(int from_y, int to_y, int * dest_y)
        y = 0 - dy;
        if (y <= start_y) y = start_y;
 
-       * dest_y = y;
+       *dest_y = y;
 }
 
 static void __get_draw_down_view_y(int from_y, int to_y, int * dest_y)
@@ -637,7 +632,7 @@ static void __get_draw_down_view_y(int from_y, int to_y, int * dest_y)
        y = start_y + dy;
        if (y > 0) y = 0;
 
-       * dest_y = y;
+       *dest_y = y;
 }
 
 static void __get_dest_y(int from_y, int to_y, int * dest_y)
index 4c955ee0b8856956b7015e00f0f191c70b9da43d..cb38962b3af4e4320a5915a7fce1802351be97b6 100755 (executable)
@@ -75,9 +75,8 @@ static Eina_Bool __pull_down_cb(void *data)
        }
 
        if (s_info.current_step >= animation_len[0] && s_info.current_step >= animation_len[1]) {
-               if (s_info.complete_cb != NULL) {
+               if (s_info.complete_cb != NULL)
                        (*s_info.complete_cb)();
-               }
 
                __animator_init();
                animator_complete();
@@ -113,13 +112,11 @@ static void __animator_init(void)
 
 static void __animator_stop(void)
 {
-       if (s_info.show_timer != NULL) {
+       if (s_info.show_timer != NULL)
                ecore_timer_del(s_info.show_timer);
-       }
 
-       if (s_info.complete_cb != NULL) {
+       if (s_info.complete_cb != NULL)
                (*s_info.complete_cb)();
-       }
 
        __animator_init();
 }
index ff72ee344b804a05668f2f87f6ea57c173f88ac5..5594b05f565bc95a20387db84d5ab80373b15fbf 100755 (executable)
@@ -145,7 +145,7 @@ static struct _s_info {
        .is_loaded = 0,
        .is_initialized = 0,
        .dl_handler = NULL,
-       .handle = {NULL,NULL,NULL},
+       .handle = {NULL, NULL, NULL},
 };
 
 static Evas_Object *_layout_get(void)
@@ -164,9 +164,8 @@ static Evas_Object *_scroller_get(void)
 
        if (win != NULL) {
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-               if (layout != NULL) {
+               if (layout != NULL)
                        scroller = elm_object_part_content_get(layout, "scroller");
-               }
        }
 
        return scroller;
@@ -183,15 +182,14 @@ static int _handler_page_create(const char *id, int category, void *view, void *
 
        page_removable_e removable = PAGE_REMOVABLE_ON;
 
-       if (category == CATEGORY_DASHBOARD) {
+       if (category == CATEGORY_DASHBOARD)
                removable = PAGE_REMOVABLE_OFF;
-       }
 
        page = page_create(scroller
-                                               , (Evas_Object*)view
-                                               , NULL, NULL
-                                               , main_get_info()->root_w, main_get_info()->root_h
-                                               , PAGE_CHANGEABLE_BG_OFF, removable);
+                       , (Evas_Object*)view
+                       , NULL, NULL
+                       , main_get_info()->root_w, main_get_info()->root_h
+                       , PAGE_CHANGEABLE_BG_OFF, removable);
        if (page != NULL && result != NULL) {
                *((Evas_Object **)result) = page;
                page_set_effect(page, page_effect_none, page_effect_none);
@@ -219,11 +217,10 @@ static int _handler_page_add(const char *id, int category, void *view, void *dat
        retv_if(page == NULL, NOTI_BROKER_ERROR_FAIL);
        retv_if(scroller == NULL, NOTI_BROKER_ERROR_FAIL);
 
-       if (category == CATEGORY_NOTIFICATION) {
+       if (category == CATEGORY_NOTIFICATION)
                ret = scroller_push_page(scroller, page, SCROLLER_PUSH_TYPE_CENTER_LEFT);
-       } else if (category == CATEGORY_DASHBOARD) {
+       else if (category == CATEGORY_DASHBOARD)
                ret = scroller_push_page(scroller, page, SCROLLER_PUSH_TYPE_CENTER_NEIGHBOR_LEFT);
-       }
 
        return (ret == W_HOME_ERROR_NONE) ? NOTI_BROKER_ERROR_NONE : NOTI_BROKER_ERROR_FAIL;
 }
@@ -276,9 +273,9 @@ static int _handler_page_reload(const char *id, int category, void *view, void *
        if (category == CATEGORY_NOTIFICATION) {
                ret = scroller_push_page(scroller, page, SCROLLER_PUSH_TYPE_CENTER_LEFT);
        } else if (category == CATEGORY_DASHBOARD) {
-               if (scroller_pop_page(scroller, page) == NULL) {
+               if (scroller_pop_page(scroller, page) == NULL)
                        _E("Failed to pop page(%p)", page);
-               }
+
                ret = scroller_push_page(scroller, page, SCROLLER_PUSH_TYPE_CENTER_NEIGHBOR_LEFT);
        }
 
@@ -398,12 +395,12 @@ int noti_broker_request(int function, const char *id, int category, void *view,
        retv_if(scroller == NULL, -1);
 
        if (function == FUNCTION_PAGE_CREATE ||
-               function == FUNCTION_PAGE_DESTROY ||
-               function == FUNCTION_PAGE_ADD ||
-               function == FUNCTION_PAGE_REMOVE ||
-               function == FUNCTION_PAGE_SHOW ||
-               function == FUNCTION_PAGE_RELOAD ||
-               function == FUNCTION_PAGE_REORDER) {
+                       function == FUNCTION_PAGE_DESTROY ||
+                       function == FUNCTION_PAGE_ADD ||
+                       function == FUNCTION_PAGE_REMOVE ||
+                       function == FUNCTION_PAGE_SHOW ||
+                       function == FUNCTION_PAGE_RELOAD ||
+                       function == FUNCTION_PAGE_REORDER) {
                _W("%x %s %d %p %p %p", function, id, category, view, data, result);
        }
 
@@ -481,9 +478,8 @@ int noti_broker_request(int function, const char *id, int category, void *view,
        int i = 0;
        int ret = NOTI_BROKER_ERROR_NONE;
        for (i = 0; fn_table[i].function != FUNCTION_VAL(FUNCTION_NONE); i++) {
-               if (function == fn_table[i].function && fn_table[i].process != NULL) {
+               if (function == fn_table[i].function && fn_table[i].process != NULL)
                        ret = fn_table[i].process(id, category, view, data, result);
-               }
        }
 
        return ret;
@@ -537,9 +533,9 @@ static void _evas_object_events_register(Evas_Object *layout, Evas_Object *scrol
        evas_object_smart_callback_add(scroller, "scroll", _scroller_smart_cb, (void*)EVENT_TYPE_SCROLL);
 
        evas_object_smart_callback_add(layout, LAYOUT_SMART_SIGNAL_EDIT_ON,
-               _layout_smart_cb, (void *)EVENT_TYPE_EDIT_START);
+                       _layout_smart_cb, (void *)EVENT_TYPE_EDIT_START);
        evas_object_smart_callback_add(layout, LAYOUT_SMART_SIGNAL_EDIT_OFF,
-               _layout_smart_cb, (void *)EVENT_TYPE_EDIT_STOP);
+                       _layout_smart_cb, (void *)EVENT_TYPE_EDIT_STOP);
 
        key_register_cb(KEY_TYPE_BACK, _noti_broker_back_cb, NULL);
 }
@@ -567,9 +563,9 @@ HAPI void noti_broker_load(void)
        _W("loading noti broker plugin done");
 
        errmsg = dlerror();
-       if (errmsg) {
+       if (errmsg)
                _E("dlerror(can be ignored): %s\n", errmsg);
-       }
+
        ret_if(dl_handle == NULL);
 
        s_info.handle.init = dlsym(dl_handle, "noti_board_plugin_init");
@@ -623,9 +619,8 @@ HAPI void noti_broker_fini(void)
        s_info.handle.fini();
        s_info.is_initialized = 0;
 
-       if (s_info.dl_handler != NULL) {
+       if (s_info.dl_handler != NULL)
                dlclose(s_info.dl_handler);
-       }
 }
 
 /*!
@@ -636,7 +631,7 @@ HAPI int noti_broker_event_fire_to_plugin(int source, int event, void *data)
        retv_if(s_info.is_loaded == 0, EVENT_RET_NONE);
 
        if (event == EVENT_TYPE_APPS_SHOW ||
-               event == EVENT_TYPE_APPS_HIDE) {
+                       event == EVENT_TYPE_APPS_HIDE) {
                _W("source:%d event:%x", source, event);
        }
 
index dafccf0225884c2fb214342fbf166bcb52c1b408..cceec986b6068e0ef0b018703646a00f275a00fd 100755 (executable)
@@ -71,27 +71,27 @@ static struct noti_detail_view_data_s {
 
        app_control_h app_control;
 } _noti_detail_view_data_s = {
-               .win = NULL,
-               .conform = NULL,
-               .box = NULL,
-               .bottom_spacer = NULL,
-               .box_up = NULL,
-               .box_bottom = NULL,
-               .more_option = NULL,
-               .box_up_ao = NULL,
-               .box_bottom_ao = NULL,
-               .scroller = NULL,
-               .layout = NULL,
-               .item_list = NULL,
-               .notification_local = NULL,
-               .is_open_more_option = EINA_FALSE,
-               .title_label = NULL,
-               .time_label = NULL,
-               .contents_title_label = NULL,
-               .paragraph_label = NULL,
-               .app_control = NULL,
-               .up_screen_text = NULL,
-               .bottom_screen_text = NULL
+       .win = NULL,
+       .conform = NULL,
+       .box = NULL,
+       .bottom_spacer = NULL,
+       .box_up = NULL,
+       .box_bottom = NULL,
+       .more_option = NULL,
+       .box_up_ao = NULL,
+       .box_bottom_ao = NULL,
+       .scroller = NULL,
+       .layout = NULL,
+       .item_list = NULL,
+       .notification_local = NULL,
+       .is_open_more_option = EINA_FALSE,
+       .title_label = NULL,
+       .time_label = NULL,
+       .contents_title_label = NULL,
+       .paragraph_label = NULL,
+       .app_control = NULL,
+       .up_screen_text = NULL,
+       .bottom_screen_text = NULL
 };
 
 #define DETAIL_VIEW_EDJE_FILE EDJEDIR"/noti_detail_view.edj"
@@ -337,11 +337,10 @@ static Eina_Bool _noti_detail_view_activate_cb(void *data, Evas_Object *obj, Elm
 {
        bool pkg_validity = evas_object_data_get(_noti_detail_view_data_s.box, DATA_KEY_PKG_VALIDITY);
 
-       if (pkg_validity) {
+       if (pkg_validity)
                _noti_detail_view_open_app_clicked_cb(data, NULL, NULL);
-       } else {
+       else
                _noti_detail_view_clear_all_clicked_cb(data, NULL, NULL);
-       }
 
        return EINA_FALSE;
 }
@@ -409,7 +408,7 @@ static bool _noti_detail_view_check_package_info(const char *package_id)
 
        _D("package_id [%s]", package_id);
 
-       if (package_manager_get_package_info (package_id, &package_info) == PACKAGE_MANAGER_ERROR_NONE) {
+       if (package_manager_get_package_info(package_id, &package_info) == PACKAGE_MANAGER_ERROR_NONE) {
                _D("package_manager_get_package_info returns true for [%s]", package_id);
                ret = true;
        }
@@ -428,7 +427,7 @@ static char *_noti_detail_view_get_app_name(char *appid)
 
        ret = pkgmgrinfo_appinfo_get_appinfo(appid, &handle);
        if (ret != PMINFO_R_OK) {
-               _E(     "Failed[%d] pkgmgrinfo_appinfo_get_appinfo(%s)", ret, appid);
+               _E("Failed[%d] pkgmgrinfo_appinfo_get_appinfo(%s)", ret, appid);
                return NULL;
        }
        ret = pkgmgrinfo_appinfo_get_label(handle, &name);
index 9644639633494172d856d0a187f32d4fe0748be6..cc9ba21abce25d9718ad63ff5d92697aca9de256 100644 (file)
@@ -80,7 +80,6 @@ void noti_event_mgr_fini()
 
        ret = notification_unregister_detailed_changed_cb(_notification_changed_cb, NULL);
 
-       if (ret != NOTIFICATION_ERROR_NONE) {
+       if (ret != NOTIFICATION_ERROR_NONE)
                _E("notification_unregister_detailed_changed_cb failed [%d]", ret);
-       }
 }
index 62e26fdde1a9e3a619fb9e99ed856eea55c934e8..9c91b7e848455296744fb782fa30d7fc45a3918a 100755 (executable)
@@ -76,11 +76,10 @@ static void _move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
                evas_object_data_set(obj, "item_move", (void *) 1);
        }
 
-       if (cur_y <= 100) {
+       if (cur_y <= 100)
                elm_object_signal_emit(layout, "open", "trash");
-       } else {
+       else
                elm_object_signal_emit(layout, "close", "trash");
-       }
 
        msg.val = ori_y - cur_y;
        edj_obj = elm_layout_edje_get(layout);
@@ -277,8 +276,8 @@ void noti_panel_cover_view_set_content(Evas_Object *cover_view, notification_h n
                elm_atspi_accessible_description_set(accessible_obj, result_str);
        } else _E("Fail to get the accessible_obj");
 
-        notification_clone(notification, &noti_clone);
-        goto_if(!noti_clone, END);
+       notification_clone(notification, &noti_clone);
+       goto_if(!noti_clone, END);
 
        noti = evas_object_data_get(cover_view, "noti");
        if (noti)
@@ -324,9 +323,8 @@ void noti_panel_cover_view_destroy(Evas_Object *cover_view)
        ret_if(!cover_view);
 
        noti = evas_object_data_del(cover_view, "noti");
-       if (noti) {
+       if (noti)
                notification_free(noti);
-       }
 
        evas_object_event_callback_del(cover_view, EVAS_CALLBACK_MOUSE_DOWN, _down_cb);
        evas_object_event_callback_del(cover_view, EVAS_CALLBACK_MOUSE_MOVE, _move_cb);
index 3e096a472b876237fabcf68cda35261510b209dd..48afd9a88c8f7cd9e0d257456af0a33e2eba0ab9 100755 (executable)
@@ -133,9 +133,8 @@ static Eina_Bool _push_new_page(void *data)
                        char *new_pkgname = NULL;
                        new_pkgname = evas_object_data_get(scroller, PRIVATE_DATA_KEY_PKGNAME);
                        if (new_pkgname) {
-                               if (!strcmp(new_pkgname, pkgname)) {
+                               if (!strcmp(new_pkgname, pkgname))
                                        eina_hash_add(s_info.h_table, &priv_id, page);
-                               }
                        }
                } else {
                        _D("push old page (%s:%d)", pkgname, priv_id);
@@ -264,9 +263,8 @@ static void _destroy_cb(void *data, Evas_Object *obj, const char *emission, cons
                s_info.page_list = eina_list_remove(s_info.page_list, page);
                scroller_pop_page(scroller, page);
                page_destroy(page);
-               if (page_count >= MAX_PAGE) {
+               if (page_count >= MAX_PAGE)
                        _find_new_notification(scroller);
-               }
        }
 }
 
@@ -437,9 +435,8 @@ static void _pop_coverview(int notification_id)
                        s_info.page_list = eina_list_remove(s_info.page_list, page);
                        scroller_pop_page(scroller, page);
                        page_destroy(page);
-                       if (page_count >= MAX_PAGE) {
+                       if (page_count >= MAX_PAGE)
                                _find_new_notification(scroller);
-                       }
                }
        } else {
                notification = notification_list_get_data(noti_list);
@@ -625,13 +622,11 @@ void noti_panel_mgr_init(void)
        if (clock_service_check_noti_indicator_enable())
                clock_service_set_noti_indicator_icon();
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _noti_back_key_cb, NULL)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_BACK, _noti_back_key_cb, NULL))
                _E("Cannot register the key callback");
-       }
 
-       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _noti_home_key_cb, NULL)) {
+       if (W_HOME_ERROR_NONE != key_register_cb(KEY_TYPE_HOME, _noti_home_key_cb, NULL))
                _E("Cannot register the key callback");
-       }
 
        main_register_cb(APP_STATE_LANGUAGE_CHANGED, _lang_changed_cb, NULL);
 }
index ef4dd4376d01af75bbc1af64371d0946f9f3fd1d..4633a00a346b1b997cd73ae074f51adda19236c4 100755 (executable)
@@ -59,11 +59,11 @@ Evas_Object *noti_panel_page_view_create(Evas_Object *scroller)
        elm_object_signal_emit(page_view, "show", "no,noti");
 
        page = page_create(scroller
-                                               , page_view
-                                               , NULL
-                                               , NULL
-                                               , main_get_info()->root_w, main_get_info()->root_h
-                                               , PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
+                       , page_view
+                       , NULL
+                       , NULL
+                       , main_get_info()->root_w, main_get_info()->root_h
+                       , PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
        page_info = evas_object_data_get(page, DATA_KEY_PAGE_INFO);
        retv_if(!page_info, NULL);
        page_info->layout_longpress = 0;
index 86cf0aa0e16672083fa87bda90dc6cc0aff266df..028f3195648887e14f06cbc6978c6a3d66007042 100755 (executable)
@@ -190,9 +190,9 @@ static void _stack_view_destroy_page(Evas_Object *layout)
 
        evas_object_data_del(layout, PRIVATE_DATA_KEY_ID);
        noti_clone = evas_object_data_del(layout, PRIVATE_DATA_KEY_NOTI);
-       if (noti_clone) {
+       if (noti_clone)
                notification_free(noti_clone);
-       }
+
        evas_object_del(layout);
 }
 
@@ -273,7 +273,7 @@ static bool _stack_view_is_valid_package_id(const char *pkg_id)
 
        _D("package_id [%s]", pkg_id);
 
-       if (package_manager_get_package_info (pkg_id, &pkg_info) == PACKAGE_MANAGER_ERROR_NONE) {
+       if (package_manager_get_package_info(pkg_id, &pkg_info) == PACKAGE_MANAGER_ERROR_NONE) {
                _D("package_manager_get_package_info returns true for [%s]", pkg_id);
                ret = true;
        }
@@ -476,9 +476,9 @@ void noti_panel_stack_view_destroy(void)
 
 Eina_Bool noti_panel_stack_view_is_visible(void)
 {
-       if (s_info.stackview) {
+       if (s_info.stackview)
                return EINA_TRUE;
-       }
+
        return EINA_FALSE;
 }
 
index 9e01a9f61b33cf34b9a48ebbcb170c487c81f814..b90d8a18415d3bea2defa4bf707e2626f5308f05 100755 (executable)
@@ -58,13 +58,13 @@ static void _noti_full_popup_view_set_icon(Evas_Object *noti_layout, const char
                goto OUT;
        }
        _D("icon_path [%s]", icon_path);
-       if (icon_path == NULL){
+       if (icon_path == NULL) {
                snprintf(unknown_icon_path, PATH_MAX, "%s/%s", app_get_resource_path(), "images/unknown.png");
                _D("unknown_icon_path[%s]", unknown_icon_path);
                err = elm_image_file_set(icon, unknown_icon_path, NULL);
-       }
-       else
+       } else {
                err = elm_image_file_set(icon, icon_path, NULL);
+       }
 
        if (err == EINA_FALSE) {
                _E("elm_image_file_set failed");
index 5ae92cdb9b8216ba9e7bc3cd30cdbf21590f44e3..fe187dcc5ebc81613a96183f78ad7767f7ab1d49 100755 (executable)
@@ -46,8 +46,7 @@ static void _noti_popup_mgr_show_popup_window(notification_h notification)
                noti_full_popup_view_destroy();
                /* And create new one */
                noti_full_popup_view_create(notification);
-       }
-       else {
+       } else {
                /* Destroy existing popup */
                noti_small_popup_view_destroy();
                /* And create new one */
@@ -84,7 +83,7 @@ static key_cb_ret_e _noti_popup_mgr_key_cb(void *data)
 
        ret = noti_full_popup_view_destroy();
 
-       if (ret != W_HOME_ERROR_NONE )
+       if (ret != W_HOME_ERROR_NONE)
                ret = noti_small_popup_view_destroy();
 
        /* W_HOME_ERROR_NONE means there was a popup, so callback chain should be stop */
index 5340e201d742ea645a84fa79d94c0f5d618ba482..d5535b068edaa08f10328d66fee35b17209d18ba 100755 (executable)
@@ -50,7 +50,7 @@ static char *_noti_small_popup_view_get_app_name(char *appid)
 
        ret = pkgmgrinfo_appinfo_get_appinfo(appid, &handle);
        if (ret != PMINFO_R_OK) {
-               _E(     "Failed[%d] pkgmgrinfo_appinfo_get_appinfo(%s)", ret, appid);
+               _E("Failed[%d] pkgmgrinfo_appinfo_get_appinfo(%s)", ret, appid);
                return NULL;
        }
        ret = pkgmgrinfo_appinfo_get_label(handle, &name);
@@ -80,13 +80,13 @@ static void _noti_small_popup_view_set_icon(Evas_Object *noti_layout, const char
                goto OUT;
        }
 
-       if (icon_path == NULL){
+       if (icon_path == NULL) {
                snprintf(unknown_icon_path, PATH_MAX, "%s/%s", app_get_resource_path(), "images/unknown.png");
                _D("unknown_icon_path[%s]", unknown_icon_path);
                err = elm_image_file_set(icon, unknown_icon_path, NULL);
-       }
-       else
+       } else {
                err = elm_image_file_set(icon, icon_path, NULL);
+       }
 
        if (err == EINA_FALSE) {
                _E("elm_image_file_set failed");
index 668e24f79de87d801862218d442c731d7b323591..10a1666e74af0203f21970da82f1141e07a1282d 100755 (executable)
@@ -64,13 +64,12 @@ static char *_get_timezone(void)
        char *timezone = NULL;
 
        int ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, &timezone);
-       if (ret < 0) {
+       if (ret < 0)
                _E("fail to get the locale time zone value(%d)", ret);
-       }
 
-       if (!timezone) {
+       if (!timezone)
                _E("system settings fail to get value: time zone");
-       }
+
        _D("time zone : %s", timezone);
 
        return timezone;
@@ -106,9 +105,8 @@ static int _get_timeformat(void)
        int ret = -1;
 
        ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &val);
-       if (ret < 0) {
+       if (ret < 0)
                _E("fail to get the timeformat(%d)", ret);
-       }
 
        return val;
 }
@@ -158,10 +156,10 @@ static i18n_udate_format_h _get_time_formatter(void)
        }
 
        u_best_pattern_capacity =
-                       (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
+               (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
 
        status = i18n_udatepg_get_best_pattern(notification_time_s.generator, u_pattern, i18n_ustring_get_length(u_pattern),
-                                                               u_best_pattern, u_best_pattern_capacity, &best_pattern_len);
+                       u_best_pattern, u_best_pattern_capacity, &best_pattern_len);
        if (status != I18N_ERROR_NONE) {
                _E("get best pattern() failed(%d)", status);
                return NULL;
@@ -178,7 +176,7 @@ static i18n_udate_format_h _get_time_formatter(void)
        if (a_best_pattern_fixed) {
                /* exception - da_DK */
                if (strncmp(notification_time_s.locale, "da_DK", 5) == 0
-               || strncmp(notification_time_s.locale, "mr_IN", 5) == 0){
+                               || strncmp(notification_time_s.locale, "mr_IN", 5) == 0) {
 
                        char *a_best_pattern_changed = g_strndup("h:mm", 4);
                        _D("best pattern is changed [%s]", a_best_pattern_changed);
@@ -186,8 +184,7 @@ static i18n_udate_format_h _get_time_formatter(void)
                                i18n_ustring_copy_ua(u_best_pattern, a_best_pattern_changed);
                                g_free(a_best_pattern_changed);
                        }
-               }
-               else {
+               } else {
                        retv_if(!i18n_ustring_copy_ua(u_best_pattern, a_best_pattern_fixed), NULL);
                }
        }
@@ -198,7 +195,7 @@ static i18n_udate_format_h _get_time_formatter(void)
        /* get formatter */
        i18n_ustring_copy_ua_n(u_timezone, notification_time_s.timezone, sizeof(u_timezone));
        status = i18n_udate_create(I18N_UDATE_PATTERN, I18N_UDATE_PATTERN, notification_time_s.locale, u_timezone, -1,
-                                                       u_pattern, -1, &formatter);
+                       u_pattern, -1, &formatter);
        if (!formatter) {
                _E("time_create() is failed.%d", status);
 
@@ -233,10 +230,10 @@ static i18n_udate_format_h _get_time_formatter_24(void)
        }
 
        u_best_pattern_capacity =
-                       (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
+               (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
 
        status = i18n_udatepg_get_best_pattern(notification_time_s.generator, u_pattern, i18n_ustring_get_length(u_pattern),
-                                                               u_best_pattern, u_best_pattern_capacity, &best_pattern_len);
+                       u_best_pattern, u_best_pattern_capacity, &best_pattern_len);
        if (status != I18N_ERROR_NONE) {
                _E("get best pattern() failed(%d)", status);
                return NULL;
@@ -253,9 +250,9 @@ static i18n_udate_format_h _get_time_formatter_24(void)
        if (a_best_pattern_fixed) {
                /* exception - pt_BR(HH'h'mm), id_ID, da_DK */
                if (strncmp(a_best_pattern_fixed, "HH'h'mm", 7) == 0
-                       || strncmp(notification_time_s.locale, "id_ID", 5) == 0
-                       || strncmp(notification_time_s.locale, "da_DK", 5) == 0
-                       || strncmp(notification_time_s.locale, "mr_IN", 5) == 0) {
+                               || strncmp(notification_time_s.locale, "id_ID", 5) == 0
+                               || strncmp(notification_time_s.locale, "da_DK", 5) == 0
+                               || strncmp(notification_time_s.locale, "mr_IN", 5) == 0) {
 
                        char *a_best_pattern_changed = g_strndup("HH:mm", 5);
                        _D("best pattern is changed [%s]", a_best_pattern_changed);
@@ -263,8 +260,7 @@ static i18n_udate_format_h _get_time_formatter_24(void)
                                i18n_ustring_copy_ua(u_best_pattern, a_best_pattern_changed);
                                g_free(a_best_pattern_changed);
                        }
-               }
-               else {
+               } else {
                        retv_if(!i18n_ustring_copy_ua(u_best_pattern, a_best_pattern_fixed), NULL);
                }
        }
@@ -275,7 +271,7 @@ static i18n_udate_format_h _get_time_formatter_24(void)
        /* get formatter */
        i18n_ustring_copy_ua_n(u_timezone, notification_time_s.timezone, sizeof(u_timezone));
        status = i18n_udate_create(I18N_UDATE_PATTERN, I18N_UDATE_PATTERN, notification_time_s.locale, u_timezone, -1,
-                                                       u_pattern, -1, &formatter);
+                       u_pattern, -1, &formatter);
        if (!formatter) {
                _E("time24_create() is failed.");
                return NULL;
@@ -303,9 +299,9 @@ static i18n_udate_format_h _get_date_formatter(void)
        skeleton_len = i18n_ustring_get_length(u_skeleton);
 
        u_best_pattern_capacity =
-                                       (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
+               (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
        status = i18n_udatepg_get_best_pattern(notification_time_s.generator, u_skeleton, skeleton_len,
-                                                               u_best_pattern, u_best_pattern_capacity, &status);
+                       u_best_pattern, u_best_pattern_capacity, &status);
        if (status != I18N_ERROR_NONE) {
                _E("get best pattern() failed(%d)", status);
                return NULL;
@@ -352,9 +348,9 @@ static i18n_udate_format_h _get_ampm_formatter(void)
        skeleton_len = i18n_ustring_get_length(u_skeleton);
 
        u_best_pattern_capacity =
-                                       (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
+               (int32_t) (sizeof(u_best_pattern) / sizeof((u_best_pattern)[0]));
        status = i18n_udatepg_get_best_pattern(notification_time_s.generator, u_skeleton, skeleton_len,
-                                                               u_best_pattern, u_best_pattern_capacity, &status);
+                       u_best_pattern, u_best_pattern_capacity, &status);
        if (status != I18N_ERROR_NONE) {
                _E("get best pattern() failed(%d)", status);
                return NULL;
@@ -363,11 +359,11 @@ static i18n_udate_format_h _get_ampm_formatter(void)
        i18n_ustring_copy_au(a_best_pattern, u_best_pattern);
        i18n_ustring_copy_ua(u_best_pattern, "a");
 
-       if (a_best_pattern[0] == 'a') {
+       if (a_best_pattern[0] == 'a')
                notification_time_s.is_pre = EINA_TRUE;
-       } else {
+       else
                notification_time_s.is_pre = EINA_FALSE;
-       }
+
 
        /* get formatter */
        i18n_ustring_copy_ua_n(u_timezone, notification_time_s.timezone, sizeof(u_timezone));
@@ -432,9 +428,8 @@ static i18n_uchar *_uastrcpy(const char *chars)
 
        len = strlen(chars);
        str = (i18n_uchar *) malloc(sizeof(i18n_uchar) *(len + 1));
-       if (!str) {
+       if (!str)
                return NULL;
-       }
 
        i18n_ustring_copy_ua(str, chars);
 
@@ -453,9 +448,9 @@ static void _set_timezone(const char *timezone)
        str = _uastrcpy(timezone);
 
        ec = i18n_ucalendar_set_default_timezone(str);
-       if (ec != I18N_ERROR_NONE) {
+       if (ec != I18N_ERROR_NONE)
                _E("ucal_setDefaultTimeZone() FAILED");
-       }
+
        free(str);
 }
 
@@ -492,26 +487,22 @@ static void _register_settings(void)
        int ret = -1;
 
        ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_TIME_CHANGED, _time_changed_cb, NULL);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set time changed cb.(%d)", ret);
-       }
 
        ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, _time_changed_cb, NULL);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set language setting's changed cb.(%d)", ret);
-       }
        notification_time_s.locale = _get_locale();
 
        ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE, _time_changed_cb, NULL);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set time zone change cb(%d)", ret);
-       }
        notification_time_s.timezone = _get_timezone();
 
        ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, _time_changed_cb, NULL);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to set time format about 24 hour changed cb(%d).", ret);
-       }
        notification_time_s.timeformat = _get_timeformat();
 }
 
@@ -522,24 +513,20 @@ static void _unregister_settings(void)
        int ret = -1;
 
        ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_TIME_CHANGED);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to unset time changed(%d).", ret);
-       }
 
        ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to unset locale language(%d).", ret);
-       }
 
        ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEZONE);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to unset time zone changed cb(%d).", ret);
-       }
 
        ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Failed to unset locale time format about 24 hour(%d).", ret);
-       }
 }
 
 
@@ -553,7 +540,7 @@ static int _get_date(time_t *intime, char *buf, int buf_len)
        int status = I18N_ERROR_INVALID_PARAMETER;
 
        u_formatted_str_capacity =
-                       (int32_t)(sizeof(u_formatted_str) / sizeof((u_formatted_str)[0]));
+               (int32_t)(sizeof(u_formatted_str) / sizeof((u_formatted_str)[0]));
 
        status = i18n_udate_format_date(notification_time_s.formatter_date, u_time, u_formatted_str, u_formatted_str_capacity, NULL, &formatted_str_len);
        if (status != I18N_ERROR_NONE) {
@@ -561,9 +548,8 @@ static int _get_date(time_t *intime, char *buf, int buf_len)
                return -1;
        }
 
-       if (formatted_str_len <= 0) {
+       if (formatted_str_len <= 0)
                _E("formatted_str_len is less than 0");
-       }
 
        buf = i18n_ustring_copy_au_n(buf, u_formatted_str, (int32_t)buf_len);
        _SD("date:(%d)[%s][%d]", formatted_str_len, buf, *intime);
@@ -585,7 +571,7 @@ static int _get_ampm(time_t *intime, char *buf, int buf_len, int *ampm_len)
 
        /* calculate formatted string capacity */
        u_formatted_str_capacity =
-                       (int32_t)(sizeof(u_formatted_str) / sizeof((u_formatted_str)[0]));
+               (int32_t)(sizeof(u_formatted_str) / sizeof((u_formatted_str)[0]));
 
        /* formatting date using formatter */
        status = i18n_udate_format_date(notification_time_s.formatter_ampm, u_time, u_formatted_str, u_formatted_str_capacity, NULL, &formatted_str_len);
@@ -594,10 +580,8 @@ static int _get_ampm(time_t *intime, char *buf, int buf_len, int *ampm_len)
                return -1;
        }
 
-       if (formatted_str_len <= 0) {
+       if (formatted_str_len <= 0)
                _E("formatted_str_len is less than 0");
-       }
-
 
        (*ampm_len) = i18n_ustring_get_length(u_formatted_str);
 
@@ -619,7 +603,7 @@ static int _get_time(time_t *intime, char *buf, int buf_len, Eina_Bool is_time_2
 
        /* calculate formatted string capacity */
        u_formatted_str_capacity =
-                       (int32_t)(sizeof(u_formatted_str) / sizeof((u_formatted_str)[0]));
+               (int32_t)(sizeof(u_formatted_str) / sizeof((u_formatted_str)[0]));
 
        /* fomatting date using formatter */
        if (is_time_24) {
@@ -689,7 +673,7 @@ w_home_error_e notification_time_to_string(time_t *time, char *string, int len)
 
        is_same_day = _check_date(time);
 
-       if (is_24hour == EINA_TRUE){
+       if (is_24hour == EINA_TRUE) {
                time_str = g_strdup(utc_time);
        } else {
                if (notification_time_s.is_pre == EINA_TRUE) {
index 5c5bd948320d7a17e4681543ac7af13c65299be1..9527fbd03bcef650bfb074b346cbcb6004c99814 100644 (file)
@@ -54,7 +54,7 @@ i18n_uchar *noti_util_convert_to_UTF16_string(const char *source_string)
        }
 
        /* Convert to i18n(UTF16) string  */
-        i18n_ustring_from_UTF8(converted_string, buffer_length + 1, &buffer_length, source_string, -1, &error_from_icu);
+       i18n_ustring_from_UTF8(converted_string, buffer_length + 1, &buffer_length, source_string, -1, &error_from_icu);
        if (error_from_icu != I18N_ERROR_NONE) {
                _E("error form icu[%d]", error_from_icu);
                free(converted_string);
index fe54acb4060d81983f8e4824067bd4df0a139d4a..7bc11dbb9a2c1097566579080ba574ebd7584ded 100755 (executable)
@@ -96,9 +96,8 @@ static void _down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
        layout_info->pressed_page = page;
        layout_info->pressed_item = page_info->item;
-       if (layout_info->pressed_page == scroller_info->plus_page) {
+       if (layout_info->pressed_page == scroller_info->plus_page)
                evas_object_data_set(layout_info->pressed_item, DATA_KEY_IS_LONGPRESS, (void *)0);
-       }
 }
 
 
@@ -165,12 +164,12 @@ HAPI void page_destroy(Evas_Object *page)
 
 #define PAGE_EDJE_FILE EDJEDIR"/page.edj"
 HAPI Evas_Object *page_create(Evas_Object *scroller
-       , Evas_Object *item
-       , const char *id
-       , const char *subid
-       , int width, int height
-       , page_changeable_bg_e changeable_bg
-       , page_removable_e removable)
+               , Evas_Object *item
+               , const char *id
+               , const char *subid
+               , int width, int height
+               , page_changeable_bg_e changeable_bg
+               , page_removable_e removable)
 {
        Evas_Object *page = NULL;
        Evas_Object *focus = NULL;
@@ -240,27 +239,23 @@ HAPI Evas_Object *page_create(Evas_Object *scroller
        evas_object_show(page_inner_bg);
        elm_object_part_content_set(page_inner, "bg", page_inner_bg);
 
-       if (item) {
+       if (item)
                elm_object_part_content_set(page_inner, "item", item);
-       }
 
        if (id) {
                page_info->id = strdup(id);
-               if (!page_info->id) {
+               if (!page_info->id)
                        _E("Critical, cannot strdup for id");
-               }
        }
 
        if (subid) {
                page_info->subid = strdup(subid);
-               if (!page_info->subid) {
+               if (!page_info->subid)
                        _E("Critical, cannot strdup for subid");
-               }
        }
 
-       if (changeable_bg) {
+       if (changeable_bg)
                bg_register_object(page_inner);
-       }
 
        evas_object_data_set(page_inner, PRIVATE_DATA_KEY_PAGE_ACCESS_OBJECT, NULL);
 
@@ -557,9 +552,8 @@ Evas_Object *page_set_item(Evas_Object *page, Evas_Object *item)
        retv_if(!page_info, NULL);
 
        old_item = elm_object_part_content_unset(page_info->page_inner, "item");
-       if (old_item) {
+       if (old_item)
                _D("You need to free the old item");
-       }
 
        elm_object_part_content_set(page_info->page_inner, "item", item);
        page_info->item = item;
@@ -696,9 +690,8 @@ HAPI char *page_read_title(Evas_Object *page)
                retv_if(!widget_id, NULL);
 
                pkginfo = add_viewer_package_find(widget_id);
-               if (pkginfo) {
+               if (pkginfo)
                        tmp = add_viewer_package_list_name(pkginfo);
-               }
 
                if (!tmp) {
                        //Fallback to the widget id
@@ -718,13 +711,11 @@ HAPI void page_set_effect(Evas_Object *page, void (*left_effect)(Evas_Object *),
 {
        ret_if(!page);
 
-       if (left_effect) {
+       if (left_effect)
                evas_object_data_set(page, PRIVATE_DATA_KEY_PAGE_LEFT_EFFECT, left_effect);
-       }
 
-       if (right_effect) {
+       if (right_effect)
                evas_object_data_set(page, PRIVATE_DATA_KEY_PAGE_RIGHT_EFFECT, right_effect);
-       }
 }
 
 
@@ -779,9 +770,8 @@ HAPI void page_effect_none(Evas_Object *page)
        /**
         * Send mouse up event when we start to scroll pages.
         */
-       if (page_info->item) {
+       if (page_info->item)
                widget_viewer_evas_feed_mouse_up_event(page_info->item);
-       }
 
        evas_object_geometry_get(page, &cur_x, &cur_y, &cur_w, &cur_h);
 
@@ -919,11 +909,10 @@ HAPI void page_set_title(Evas_Object *page, const char *title)
        free(page_info->title);
 
        /* Title can be NULL */
-       if (title) {
+       if (title)
                page_info->title = strdup(title);
-       } else {
+       else
                page_info->title = NULL;
-       }
 }
 
 
index a9fddd604d545e48a64a21bea5b19a6cf4a17693..76025ff1762a000c613dc326ebd222e8fc7d1611 100644 (file)
@@ -49,9 +49,8 @@ HAPI page_info_s *page_info_create(const char *id, const char *subid, double per
                }
        }
 
-       if (id) {
+       if (id)
                page_info->removable = 1;
-       }
 
        page_info->period = period;
 
@@ -80,9 +79,9 @@ HAPI page_info_s *page_info_dup(page_info_s *page_info)
        dup = page_info_create(page_info->id, page_info->subid, page_info->period);
        retv_if(!dup, NULL);
 
-       if (page_info->title) {
+       if (page_info->title)
                dup->title = strdup(page_info->title);
-       }
+
        dup->width = page_info->width;
        dup->height = page_info->height;
        dup->direction = page_info->direction;
@@ -130,7 +129,7 @@ HAPI void page_info_list_destroy(Eina_List *page_info_list)
 
 HAPI int page_info_is_removable(const char *id)
 {
-       if(!id) return 0;
+       if (!id) return 0;
        return 1;
 }
 
index 22ed5eda6805a58c70159dd7016c109962c81a29..0d2e4c533721cbdb549755a910e86b63fac89dcf 100755 (executable)
@@ -264,7 +264,7 @@ HAPI w_home_error_e pkgmgr_item_list_remove_item(const char *pkg_id, const char
 
 
 
-HAPI void pkgmgr_item_list_affect_pkgid(const char *pkg_id, Eina_Bool (*_affected_cb)(const char *, Evas_Object *, void *), void *data)
+HAPI void pkgmgr_item_list_affect_pkgid(const char *pkg_id,    Eina_Bool(*_affected_cb)(const char *, Evas_Object *, void *), void *data)
 {
        const Eina_List *l = NULL;
        const Eina_List *ln = NULL;
@@ -287,7 +287,7 @@ HAPI void pkgmgr_item_list_affect_pkgid(const char *pkg_id, Eina_Bool (*_affecte
 
 
 
-HAPI void pkgmgr_item_list_affect_appid(const char *app_id, Eina_Bool (*_affected_cb)(const char *, Evas_Object *, void *), void *data)
+HAPI void pkgmgr_item_list_affect_appid(const char *app_id, Eina_Bool(*_affected_cb)(const char *, Evas_Object *, void *), void *data)
 {
        const Eina_List *l = NULL;
        const Eina_List *ln = NULL;
@@ -323,20 +323,17 @@ HAPI w_home_error_e pkgmgr_uninstall(const char *appid)
 
        pkgmgrinfo_appinfo_h handle = NULL;
        if (PMINFO_R_OK != pkgmgrinfo_appinfo_get_appinfo(appid, &handle)) {
-               if (PKGMGR_R_OK != pkgmgr_client_free(req_pc)) {
+               if (PKGMGR_R_OK != pkgmgr_client_free(req_pc))
                        _E("cannot free pkgmgr_client for request.");
-               }
                return W_HOME_ERROR_FAIL;
        }
 
        if (PMINFO_R_OK != pkgmgrinfo_appinfo_get_pkgid(handle, &pkgid)) {
-               if (PMINFO_R_OK != pkgmgrinfo_appinfo_destroy_appinfo(handle)) {
+               if (PMINFO_R_OK != pkgmgrinfo_appinfo_destroy_appinfo(handle))
                        _E("cannot destroy the appinfo");
-               }
 
-               if (PKGMGR_R_OK != pkgmgr_client_free(req_pc)) {
+               if (PKGMGR_R_OK != pkgmgr_client_free(req_pc))
                        _E("cannot free pkgmgr_client for request.");
-               }
 
                return W_HOME_ERROR_FAIL;
        }
@@ -459,7 +456,7 @@ static w_home_error_e _start(const char *package, const char *val, void *scrolle
        widget_service_get_widget_list_by_pkgid(package, _get_widget_list_cb, (void*) val);
 
        register unsigned int i;
-       for (i = 0; start_cb[i].name; i ++) {
+       for (i = 0; start_cb[i].name; i++) {
                if (strcasecmp(val, start_cb[i].name)) continue;
                break_if(NULL == start_cb[i].handler);
                return start_cb[i].handler(package, scroller);
@@ -516,13 +513,12 @@ static int _end_cb(pkgmgrinfo_appinfo_h handle, void *user_data)
        pkgmgrinfo_appinfo_get_appid(handle, &appid);
 
        rt = user_data;
-       if (!strcmp(rt->status, "install")) {
-               /* Install an app */
-       } else if (!strcmp(rt->status, "update")) {
-               /* Update an app */
-       } else {
+       if (!strcmp(rt->status, "install"))
+               ;/* Install an app */
+       else if (!strcmp(rt->status, "update"))
+               ;/* Update an app */
+       else
                _E("No routines for this status (%s:%s)", rt->package, rt->status);
-       }
 
        return 0;
 }
@@ -628,9 +624,8 @@ static w_home_error_e _pkgmgr_cb(uid_t target_uid, int req_id, const char *pkg_t
                if (strcasecmp(pkgmgr_cbs[i].key, key)) continue;
                break_if(!pkgmgr_cbs[i].func);
 
-               if (W_HOME_ERROR_NONE != pkgmgr_cbs[i].func(package, val, NULL)) {
+               if (W_HOME_ERROR_NONE != pkgmgr_cbs[i].func(package, val, NULL))
                        _E("pkgmgr_cbs[%u].func has errors.", i);
-               }
 
                return W_HOME_ERROR_NONE;
        }
@@ -713,14 +708,13 @@ ERROR:
 
 HAPI w_home_error_e pkgmgr_init(void)
 {
-       if (NULL != pkg_mgr_info.listen_pc) {
+       if (NULL != pkg_mgr_info.listen_pc)
                return W_HOME_ERROR_NONE;
-       }
 
        pkg_mgr_info.listen_pc = pkgmgr_client_new(PC_LISTENING);
        retv_if(NULL == pkg_mgr_info.listen_pc, W_HOME_ERROR_FAIL);
        retv_if(pkgmgr_client_listen_status(pkg_mgr_info.listen_pc,
-                       _pkgmgr_cb, NULL) != PKGMGR_R_OK, W_HOME_ERROR_FAIL);
+                               _pkgmgr_cb, NULL) != PKGMGR_R_OK, W_HOME_ERROR_FAIL);
 
        return W_HOME_ERROR_NONE;
 }
@@ -730,9 +724,9 @@ HAPI w_home_error_e pkgmgr_init(void)
 HAPI void pkgmgr_fini(void)
 {
        ret_if(NULL == pkg_mgr_info.listen_pc);
-       if (pkgmgr_client_free(pkg_mgr_info.listen_pc) != PKGMGR_R_OK) {
+       if (pkgmgr_client_free(pkg_mgr_info.listen_pc) != PKGMGR_R_OK)
                _E("cannot free pkgmgr_client for listen.");
-       }
+
        pkg_mgr_info.listen_pc = NULL;
 }
 
index 56780ab22a28e31e63f9868fbde9c2f250a4b086..172134b076397e7d716762fb0d834e677f0e8216 100755 (executable)
@@ -47,9 +47,8 @@ static void _popup_weconn_gear_to_home(void)
 
        app_control_set_app_id(service, APPID_WC_POPUP);
        int ret = app_control_send_launch_request(service, NULL, NULL);
-       if (ret != APP_CONTROL_ERROR_NONE) {
+       if (ret != APP_CONTROL_ERROR_NONE)
                _E("Failed to launch:%d", ret);
-       }
 
        app_control_destroy(service);
 }
@@ -62,7 +61,6 @@ static void _popup_after_tutorial(void)
 
 void popup_show(int stage)
 {
-       if (stage == POPUP_STAGE_AFTER_TUTORIAL) {
+       if (stage == POPUP_STAGE_AFTER_TUTORIAL)
                _popup_after_tutorial();
-       }
 }
index 2f36c87719b7d0c8897297dbd97ba06de45a4767..9e7b891ee176dd9567f720f909c99824d891d8bb 100755 (executable)
@@ -65,8 +65,8 @@ typedef struct {
 } powermode_cb_s;
 
 HAPI int power_mode_register_cb(
-       int type,
-       void (*result_cb)(void *, void *), void *result_data)
+               int type,
+               void (*result_cb)(void *, void *), void *result_data)
 {
        retv_if(result_cb == NULL, W_HOME_ERROR_INVALID_PARAMETER);
 
@@ -83,8 +83,8 @@ HAPI int power_mode_register_cb(
 }
 
 HAPI void power_mode_unregister_cb(
-       int type,
-       void (*result_cb)(void *, void *))
+               int type,
+               void (*result_cb)(void *, void *))
 {
        const Eina_List *l;
        const Eina_List *n;
@@ -111,29 +111,28 @@ static void _execute_cbs(int type, void *event_info)
        }
 }
 
-static Evas_Object *_layout_get(void) {
+static Evas_Object *_layout_get(void)
+{
        Evas_Object *win = main_get_info()->win;
        Evas_Object *layout = NULL;
 
-       if (win != NULL) {
+       if (win != NULL)
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-       }
 
        return layout;
 }
 
-static Evas_Object *_scroller_get(void) {
+static Evas_Object *_scroller_get(void)
+{
        Evas_Object *win = main_get_info()->win;
        Evas_Object *layout = NULL;
        Evas_Object *scroller = NULL;
 
        if (win != NULL) {
                layout = evas_object_data_get(win, DATA_KEY_LAYOUT);
-               if (layout != NULL) {
+               if (layout != NULL)
                        scroller = elm_object_part_content_get(layout, "scroller");
-               }
        }
-
        return scroller;
 }
 
@@ -144,9 +143,8 @@ static int _psmode_get(void)
 {
        int ps_mode = SETTING_PSMODE_NORMAL;
 
-       if(vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &ps_mode) < 0) {
+       if (vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &ps_mode) < 0)
                _E("Failed to get VCONFKEY_SETAPPL_PSMODE");
-       }
 
        return ps_mode;
 }
@@ -174,11 +172,10 @@ static void _psmode_apply(int mode)
                _execute_cbs(POWER_MODE_ENHANCED_OFF, NULL);
 
                page_info_list = db_write_list();
-               if (page_info_list) {
+               if (page_info_list)
                        scroller_push_pages(scroller, page_info_list, _del_list, page_info_list);
-               } else {
+               else
                        scroller_push_pages(scroller, NULL, NULL, NULL);
-               }
 
                //if(tutorial_is_first_boot()) tutorial_create(_layout_get());
        } else if (mode == SETTING_PSMODE_WEARABLE_ENHANCED) {
@@ -201,13 +198,12 @@ static void _psmode_apply(int mode)
  */
 static int _cooldown_mode_status_to_mode(const char *status)
 {
-       if (strcmp(status, COOLDOWN_STATUS_RELEASE) == 0) {
+       if (strcmp(status, COOLDOWN_STATUS_RELEASE) == 0)
                return COOLDOWN_MODE_RELEASE;
-       } else if (strcmp(status, COOLDOWN_STATUS_LIMITATION) == 0) {
+       else if (strcmp(status, COOLDOWN_STATUS_LIMITATION) == 0)
                return COOLDOWN_MODE_LIMITATION;
-       } else if (strcmp(status, COOLDOWN_STATUS_WARNING) == 0) {
+       else if (strcmp(status, COOLDOWN_STATUS_WARNING) == 0)
                return COOLDOWN_MODE_WARNING;
-       }
 
        return COOLDOWN_MODE_RELEASE;
 }
@@ -228,9 +224,8 @@ static int _cooldown_mode_get_from_dbus(void)
 
 static int _cooldown_mode_get(void)
 {
-       if (s_info.cooldown_mode == -1) {
+       if (s_info.cooldown_mode == -1)
                s_info.cooldown_mode = _cooldown_mode_get_from_dbus();
-       }
 
        return s_info.cooldown_mode;
 }
@@ -296,13 +291,13 @@ static void _power_mode_apply(void)
                s_info.applied_mode = POWER_MODE_COOLDOWN_MODE;
 
        } else {
-               if (s_info.applied_mode == POWER_MODE_POWER_ENHANCED_MODE) {
+               if (s_info.applied_mode == POWER_MODE_POWER_ENHANCED_MODE)
                        _psmode_apply(ps_mode);
-               } else if (s_info.applied_mode == POWER_MODE_COOLDOWN_MODE) {
+               else if (s_info.applied_mode == POWER_MODE_COOLDOWN_MODE)
                        _cooldown_mode_apply(cooldown_mode);
-               } else {
+               else
                        _E("no power mode applied");
-               }
+
                s_info.applied_mode = -1;
        }
 }
@@ -331,13 +326,11 @@ static void _cooldown_mode_changed_cb(void *user_data, void *event_info)
  */
 HAPI void power_mode_init(void)
 {
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, _psmode_changed_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, _psmode_changed_cb, NULL) < 0)
                _E("Failed to register the VCONFKEY_SETAPPL_PSMODE callback");
-       }
 
-       if (home_dbus_register_cb(DBUS_EVENT_COOLDOWN_STATE_CHANGED, _cooldown_mode_changed_cb, NULL) != W_HOME_ERROR_NONE) {
+       if (home_dbus_register_cb(DBUS_EVENT_COOLDOWN_STATE_CHANGED, _cooldown_mode_changed_cb, NULL) != W_HOME_ERROR_NONE)
                _E("Failed to register cooldown status changed cb");
-       }
 }
 
 HAPI void power_mode_ui_init(void)
@@ -349,9 +342,8 @@ HAPI void power_mode_ui_init(void)
 
 HAPI void power_mode_fini(void)
 {
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, _psmode_changed_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, _psmode_changed_cb) < 0)
                _E("Failed to ignore the VCONFKEY_SETAPPL_PSMODE callback");
-       }
 
        home_dbus_unregister_cb(DBUS_EVENT_COOLDOWN_STATE_CHANGED, _cooldown_mode_changed_cb);
 
@@ -362,27 +354,24 @@ HAPI int emergency_mode_enabled_get(void)
 {
        int mode = _psmode_get();
 
-       if (mode == SETTING_PSMODE_WEARABLE_ENHANCED) {
+       if (mode == SETTING_PSMODE_WEARABLE_ENHANCED)
                return 1;
-       }
 
        return 0;
 }
 
 HAPI int cooldown_mode_enabled_get(void)
 {
-       if (_cooldown_mode_get() == COOLDOWN_MODE_LIMITATION) {
+       if (_cooldown_mode_get() == COOLDOWN_MODE_LIMITATION)
                return 1;
-       }
 
        return 0;
 }
 
 HAPI int cooldown_mode_warning_get(void)
 {
-       if (_cooldown_mode_get() == COOLDOWN_MODE_WARNING) {
+       if (_cooldown_mode_get() == COOLDOWN_MODE_WARNING)
                return 1;
-       }
 
        return 0;
 }
index 3f96f067e00e5e2411a595e8f2b6ab37a03e3460..b8b73c1eb075f12975e9233cc9b0590ae078ca89 100755 (executable)
@@ -87,9 +87,8 @@ void screen_reader_update_widget_description(Evas_Object *target_obj, char *name
        }
 
        access_obj = elm_access_object_get(target_obj);
-       if (access_obj) {
+       if (access_obj)
                elm_atspi_accessible_description_set(access_obj, name);
-       }
 }
 
 void screen_reader_make_relationship(Evas_Object *prev, Evas_Object *next)
@@ -142,9 +141,8 @@ void screen_reader_update_name(Evas_Object *target_obj, const char *name)
                        item->name = strdup(name);
 
                        access_obj = elm_access_object_get(item->target);
-                       if (access_obj) {
+                       if (access_obj)
                                elm_atspi_accessible_name_set(access_obj, item->name);
-                       }
                }
        }
 }
@@ -170,9 +168,8 @@ void screen_reader_update_description(Evas_Object *target_obj, const char *descr
                        item->description = strdup(description);
 
                        access_obj = elm_access_object_get(item->target);
-                       if (access_obj) {
+                       if (access_obj)
                                elm_atspi_accessible_description_set(access_obj, item->description);
-                       }
                }
        }
 }
@@ -272,9 +269,8 @@ static Eina_Bool __screen_reader_activate_cb(void *data, Evas_Object *obj, Elm_A
 {
        access_info_t *info = (access_info_t*) data;
 
-       if (info && info->clicked_cb) {
+       if (info && info->clicked_cb)
                (*info->clicked_cb)();
-       }
 
        return EINA_FALSE;
 }
index 425b3d0510d13d4c3559c59f069d86f3ea747694..97486bbc204e6b4685fcfdedce9da2fdf6e348a8 100755 (executable)
@@ -18,6 +18,7 @@
 #include <Elementary.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <app.h>
 #include <dlog.h>
 #include <bundle.h>
 #include <vconf.h>
@@ -130,9 +131,8 @@ HAPI Evas_Object *scroller_get_picked_up_page(Evas_Object *scroller)
 
        EINA_LIST_FREE(list, obj) {
                continue_if(!obj);
-               if (evas_object_data_get(obj, DATA_KEY_PICKED_UP_PAGE)) {
+               if (evas_object_data_get(obj, DATA_KEY_PICKED_UP_PAGE))
                        cur_page = obj;
-               }
        }
 
        return cur_page;
@@ -178,11 +178,10 @@ HAPI Evas_Object *scroller_get_focused_page(Evas_Object *scroller)
 
                evas_object_geometry_get(obj, &x, NULL, &w, NULL);
                if (!w) continue;
-               if (x + w > half_line && x <= whole_line - pad) {
+               if (x + w > half_line && x <= whole_line - pad)
                        cur_page = obj;
-               } else if (x <= half_line && x >= pad) {
+               else if (x <= half_line && x >= pad)
                        cur_page = obj;
-               }
        }
 
        return cur_page;
@@ -338,16 +337,15 @@ static void _elm_box_pack_after(Evas_Object *scroller, Evas_Object *page, Evas_O
        list = elm_box_children_get(scroller_info->box);
 
        EINA_LIST_FREE(list, item) {
-               if (item == after) {
+               if (item == after)
                        is_exist = 1;
-               }
        }
 
-       if (is_exist) {
+       if (is_exist)
                elm_box_pack_after(scroller_info->box, page, after);
-       } else {
+       else
                elm_box_pack_start(scroller_info->box, page);
-       }
+
        /* recalculate : child box with pages -> parent box */
        elm_box_recalculate(scroller_info->box);
        elm_box_recalculate(scroller_info->box_layout);
@@ -374,9 +372,8 @@ static void _elm_box_unpack(Evas_Object *scroller, Evas_Object *page)
        EINA_LIST_FREE(list, tmp) {
                continue_if(!tmp);
 
-               if (page == tmp) {
+               if (page == tmp)
                        is_page_exist = 1;
-               }
        }
 
        if (is_page_exist == 0) {
@@ -441,9 +438,9 @@ static Evas_Object *_select_singular_index(Evas_Object *scroller)
        cur_page = scroller_get_focused_page(scroller);
        retv_if(!cur_page, NULL);
 
-       if (scroller_info->single_index) {
+       if (scroller_info->single_index)
                index_bring_in_page(scroller_info->single_index, cur_page);
-       }
+
        return scroller_info->single_index;
 }
 
@@ -470,9 +467,8 @@ static struct index_st *_select_plural_index(Evas_Object *scroller)
        if (!layout_info->edit) {
                layout_show_multi_index(scroller_info->indicator_layout);
 
-               for (j = 0; j < PAGE_DIRECTION_ANY; j++) {
+               for (j = 0; j < PAGE_DIRECTION_ANY; j++)
                        multi_index_bring_in_page(scroller_info->index[j], cur_page);
-               }
 
                scroller_add_index_hide_timer(scroller);
        }
@@ -578,16 +574,14 @@ static void _scroll_cb(void *data, Evas_Object *scroller, void *event_info)
        if (0 == x % scroller_info->page_width) {
                /* Page is on the edge */
                scroller_info->scrolling = 0;
-               if (main_get_info()->is_tts) {
+               if (main_get_info()->is_tts)
                        scroller_restore_inner_focus(scroller);
-               }
        } else {
                /* Page is not on the edge */
                if (!scroller_info->scrolling) {
                        scroller_info->scrolling = 1;
-                       if (main_get_info()->is_tts) {
+                       if (main_get_info()->is_tts)
                                scroller_backup_inner_focus(scroller);
-                       }
                }
        }
 
@@ -603,9 +597,9 @@ static void _scroll_cb(void *data, Evas_Object *scroller, void *event_info)
                _select_singular_index(scroller);
                break;
        case SCROLLER_INDEX_PLURAL:
-               if (!evas_object_data_get(scroller_info->layout, DATA_KEY_ADD_VIEWER)) {
+               if (!evas_object_data_get(scroller_info->layout, DATA_KEY_ADD_VIEWER))
                        _select_plural_index(scroller);
-               }
+
                break;
        default:
                _E("Cannot reach here");
@@ -705,19 +699,17 @@ static Eina_Bool _rotary_cb(void *data, Evas_Object *obj, Eext_Rotary_Event_Info
        retv_if(!cur, ECORE_CALLBACK_PASS_ON);
 
        _D("Detent detected, obj[%p], direction[%d], timeStamp[%u]", obj, rotary_info->direction, rotary_info->time_stamp);
-       if (rotary_info->direction == EEXT_ROTARY_DIRECTION_CLOCKWISE) {
+       if (rotary_info->direction == EEXT_ROTARY_DIRECTION_CLOCKWISE)
                next = scroller_get_right_page(scroller, cur);
-       } else {
+       else
                next = scroller_get_left_page(scroller, cur);
-       }
+
        if (scroller_info->scroller_type == WIDGETS_STATE_ADD) {
-               if (!evas_object_data_get(next, "package")) {
+               if (!evas_object_data_get(next, "package"))
                        return ECORE_CALLBACK_PASS_ON;
-               }
        }
-       if (next) {
+       if (next)
                _rotary_move_page_to_next(scroller, next, SCROLLER_FREEZE_OFF);
-       }
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -751,9 +743,8 @@ HAPI void scroller_init_rotary(Evas_Object *scroller)
 
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
                _D("This scroller is Normal scroller");
-               if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_RESUME, _resume_result_cb, scroller)) {
+               if (W_HOME_ERROR_NONE != main_register_cb(APP_STATE_RESUME, _resume_result_cb, scroller))
                        _E("Cannot register the pause callback");
-               }
        } else {
                _D("This scroller is Remove or Add scroller");
        }
@@ -1029,11 +1020,10 @@ HAPI w_home_error_e scroller_push_page_before_edit(Evas_Object *real_scroller, E
        }
        eina_list_free(list);
 
-       if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
+       if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL)
                multi_index_update(scroller);
-       } else {
+       else
                index_update(scroller_info->single_index, scroller, INDEX_BRING_IN_NONE);
-       }
 
        return W_HOME_ERROR_NONE;
 }
@@ -1075,11 +1065,10 @@ HAPI w_home_error_e scroller_push_page_before(Evas_Object *scroller, Evas_Object
        }
        eina_list_free(list);
 
-       if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
+       if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL)
                multi_index_update(scroller);
-       } else {
+       else
                index_update(scroller_info->single_index, scroller, INDEX_BRING_IN_NONE);
-       }
 
        return W_HOME_ERROR_NONE;
 }
@@ -1125,9 +1114,8 @@ HAPI w_home_error_e scroller_push_page_after(Evas_Object *scroller, Evas_Object
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
                multi_index_update(scroller);
        } else {
-               if (scroller_info->single_index) {
+               if (scroller_info->single_index)
                        index_update(scroller_info->single_index, scroller, INDEX_BRING_IN_NONE);
-               }
        }
 
        return W_HOME_ERROR_NONE;
@@ -1151,9 +1139,8 @@ static Eina_Bool _index_update_cb(void *data)
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
                multi_index_update(scroller);
        } else {
-               if (scroller_info->single_index) {
+               if (scroller_info->single_index)
                        index_update(scroller_info->single_index, scroller, INDEX_BRING_IN_AFTER);
-               }
        }
 
        _D("Index is updated");
@@ -1225,9 +1212,9 @@ HAPI w_home_error_e scroller_push_page(Evas_Object *scroller, Evas_Object *page,
                _elm_box_pack_before(scroller, page, tmp);
                break;
        case SCROLLER_PUSH_TYPE_CENTER_NEIGHBOR_LEFT:
-               if (scroller_info->center_neighbor_left) {
+               if (scroller_info->center_neighbor_left)
                        _elm_box_unpack(scroller, scroller_info->center_neighbor_left);
-               }
+
                _elm_box_pack_before(scroller, page, scroller_info->center);
                scroller_info->center_neighbor_left = page;
                break;
@@ -1235,15 +1222,15 @@ HAPI w_home_error_e scroller_push_page(Evas_Object *scroller, Evas_Object *page,
                _elm_box_pack_after(scroller, page, scroller_info->center);
                _elm_box_unpack(scroller, scroller_info->center);
 
-               if (evas_object_data_del(scroller_info->center, PRIVATE_DATA_KEY_IS_DUMMY) != NULL) {
+               if (evas_object_data_del(scroller_info->center, PRIVATE_DATA_KEY_IS_DUMMY) != NULL)
                        page_destroy(scroller_info->center);
-               }
+
                scroller_info->center = page;
                break;
        case SCROLLER_PUSH_TYPE_CENTER_NEIGHBOR_RIGHT:
-               if (scroller_info->center_neighbor_right) {
+               if (scroller_info->center_neighbor_right)
                        _elm_box_unpack(scroller, scroller_info->center_neighbor_right);
-               }
+
                _elm_box_pack_after(scroller, page, scroller_info->center);
                scroller_info->center_neighbor_right = page;
                break;
@@ -1260,14 +1247,13 @@ HAPI w_home_error_e scroller_push_page(Evas_Object *scroller, Evas_Object *page,
                break;
        }
 
-       if (scroller_info->index_update_timer) {
+       if (scroller_info->index_update_timer)
                ecore_timer_reset(scroller_info->index_update_timer);
-       } else {
+       else
                scroller_info->index_update_timer = ecore_timer_add(INDEX_UPDATE_TIME, _index_update_cb, scroller);
-       }
-       if (!scroller_info->index_update_timer) {
+
+       if (!scroller_info->index_update_timer)
                _E("Cannot add an index update timer");
-       }
 
        return W_HOME_ERROR_NONE;
 }
@@ -1323,9 +1309,8 @@ HAPI Evas_Object *scroller_pop_page(Evas_Object *scroller, Evas_Object *page)
                _elm_box_unpack(scroller, page);
 
                scroller_info->index_update_timer = ecore_timer_add(INDEX_UPDATE_TIME, _index_update_cb, scroller);
-               if (!scroller_info->index_update_timer) {
+               if (!scroller_info->index_update_timer)
                        _E("Cannot add an index update timer");
-               }
 
                if (1 == count) {
                        _D("There is only one page");
@@ -1351,13 +1336,13 @@ static void _change_favorites_order_cb(keynode_t *node, void *data)
        _D("Change favorites order");
 
        /* check Emergency Mode */
-       if(emergency_mode_enabled_get()) {
+       if (emergency_mode_enabled_get()) {
                _E("emergency mode enabled");
                return;
        }
 
        // 0 : init, 1 : backup request, 2 : restore request, 3: write done
-       if(vconf_get_int(VCONF_KEY_WMS_FAVORITES_ORDER, &value) < 0) {
+       if (vconf_get_int(VCONF_KEY_WMS_FAVORITES_ORDER, &value) < 0) {
                _E("Failed to get VCONF_KEY_WMS_FAVORITES_ORDER");
                return;
        }
@@ -1392,9 +1377,9 @@ static Eina_Bool _push_all_page_cb(void *data)
 
        page_info = eina_list_nth(page_info_list, i);
        if (!page_info) {
-               if (!i) {
+               if (!i)
                        _W("page_info_list is zero");
-               }
+
                goto END;
        }
        i++;
@@ -1410,10 +1395,10 @@ static Eina_Bool _push_all_page_cb(void *data)
        evas_object_show(page_info->item);
 
        page_info->page = page_create(scroller
-                                                       , page_info->item
-                                                       , page_info->id, page_info->subid
-                                                       , scroller_info->page_width, scroller_info->page_height
-                                                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
+                       , page_info->item
+                       , page_info->id, page_info->subid
+                       , scroller_info->page_width, scroller_info->page_height
+                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
        if (!page_info->page) {
                evas_object_del(page_info->item);
                _E("cannot create a page");
@@ -1459,8 +1444,7 @@ static Eina_Bool _push_all_page_cb(void *data)
 END:
        /* If there are 15 pages, do not append the plus page */
        count = scroller_count_direction(scroller, PAGE_DIRECTION_RIGHT);
-       if (count < MAX_WIDGET && page_create_plus_page(scroller))
-       {
+       if (count < MAX_WIDGET && page_create_plus_page(scroller)) {
                page_set_effect(scroller_info->plus_page, page_effect_none, page_effect_none);
                scroller_push_page(scroller, scroller_info->plus_page, SCROLLER_PUSH_TYPE_LAST);
        }
@@ -1468,9 +1452,8 @@ END:
        after_func = evas_object_data_del(scroller, PRIVATE_DATA_KEY_SCROLLER_AFTER_FUNC);
        after_func_data = evas_object_data_del(scroller, PRIVATE_DATA_KEY_SCROLLER_AFTER_FUNC_DATA);
 
-       if (after_func) {
+       if (after_func)
                after_func(after_func_data);
-       }
 
        _W("It's done to push all the pages(%d)", i);
        i = 0;
@@ -1486,9 +1469,8 @@ END:
                _change_favorites_order_cb(NULL, NULL);
 
                /* wms vconf has to be dealt after pushing pages */
-               if (vconf_notify_key_changed(VCONF_KEY_WMS_FAVORITES_ORDER, _change_favorites_order_cb, NULL) < 0) {
+               if (vconf_notify_key_changed(VCONF_KEY_WMS_FAVORITES_ORDER, _change_favorites_order_cb, NULL) < 0)
                        _E("Failed to register the changed_apps_order callback");
-               }
        }
 
        /* Key register */
@@ -1502,9 +1484,8 @@ END:
        /* Widgets can be removed before launching w-home */
        /* But, we do not need to refresh the DB */
        count = scroller_count_direction(scroller, PAGE_DIRECTION_RIGHT);
-       if (count <= 1) {
+       if (count <= 1)
                _E("Right page is only one or zero");
-       }
 
        wms_change_favorite_order(W_HOME_WMS_BACKUP);
 
@@ -1529,10 +1510,10 @@ static w_home_error_e _dummy_center(Evas_Object *scroller)
        retv_if(!center, W_HOME_ERROR_FAIL);
 
        page = page_create(scroller
-                                               , center
-                                               , NULL, NULL
-                                               , scroller_info->page_width, scroller_info->page_height
-                                               , PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
+                       , center
+                       , NULL, NULL
+                       , scroller_info->page_width, scroller_info->page_height
+                       , PAGE_CHANGEABLE_BG_OFF, PAGE_REMOVABLE_OFF);
        if (!page) {
                _E("Cannot create a page");
                evas_object_del(center);
@@ -1565,9 +1546,8 @@ HAPI w_home_error_e scroller_push_pages(Evas_Object *scroller, Eina_List *page_i
                timer = NULL;
        }
 
-       if (!scroller_info->center && W_HOME_ERROR_NONE != _dummy_center(scroller)) {
+       if (!scroller_info->center && W_HOME_ERROR_NONE != _dummy_center(scroller))
                _E("Cannot create a dummy clock");
-       }
 
        /* We have to prevent pushing pages doubly */
        /* We don't need to care about LEFT pages according to UIG */
@@ -1633,11 +1613,8 @@ HAPI void scroller_pop_pages(Evas_Object *scroller, page_direction_e direction)
                page_info = evas_object_data_get(page, DATA_KEY_PAGE_INFO);
                continue_if(!page_info);
 
-               if (PAGE_DIRECTION_ANY != direction
-                       && direction != page_info->direction)
-               {
+               if (PAGE_DIRECTION_ANY != direction && direction != page_info->direction)
                        continue;
-               }
 
                if (PAGE_DIRECTION_RIGHT == page_info->direction) {
                        elm_object_part_content_unset(page_info->page_inner, "item");
@@ -1711,7 +1688,7 @@ HAPI Eina_Bool scroller_is_scrolling(Evas_Object *scroller)
        scroller_info = evas_object_data_get(scroller, DATA_KEY_SCROLLER_INFO);
        retv_if(!scroller_info, EINA_FALSE);
 
-       return scroller_info->scrolling? EINA_TRUE:EINA_FALSE;
+       return scroller_info->scrolling ? EINA_TRUE : EINA_FALSE;
 }
 
 
@@ -1738,9 +1715,8 @@ HAPI void scroller_unfreeze(Evas_Object *scroller)
        scroller_info = evas_object_data_get(scroller, DATA_KEY_SCROLLER_INFO);
        ret_if(!scroller_info);
 
-       while (elm_object_scroll_freeze_get(scroller_info->box)) {
+       while (elm_object_scroll_freeze_get(scroller_info->box))
                elm_object_scroll_freeze_pop(scroller_info->box);
-       }
 }
 
 
@@ -1763,9 +1739,9 @@ static inline int _get_index_in_list(Evas_Object *box, Evas_Object *page)
                i += exist;
        }
 
-       if (exist) {
+       if (exist)
                i = 0;
-       }
+
        return i;
 }
 
@@ -1799,9 +1775,9 @@ static inline void _page_bring_in(Evas_Object *scroller, int index, scroller_fre
        elm_scroller_page_bring_in(scroller, index, 0);
        if (is_freezed && cur_freezed) scroller_freeze(scroller);
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
-               for (j = 0; j < PAGE_DIRECTION_ANY; j++) {
+               for (j = 0; j < PAGE_DIRECTION_ANY; j++)
                        multi_index_bring_in_page(scroller_info->index[j], page);
-               }
+
                scroller_add_index_hide_timer(scroller);
        } else {
                index_bring_in_page(scroller_info->single_index, page);
@@ -1838,9 +1814,8 @@ static inline void _page_show(Evas_Object *scroller, int index, scroller_freeze_
        if (is_freezed && cur_freezed) scroller_freeze(scroller);
 
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
-               for (i = 0; i < PAGE_DIRECTION_ANY; i++) {
+               for (i = 0; i < PAGE_DIRECTION_ANY; i++)
                        multi_index_bring_in_page(scroller_info->index[i], page);
-               }
        } else {
                index_bring_in_page(scroller_info->single_index, page);
        }
@@ -1904,15 +1879,15 @@ HAPI void scroller_bring_in_by_push_type(Evas_Object *scroller, scroller_push_ty
                break;
        case SCROLLER_PUSH_TYPE_CENTER_NEIGHBOR_LEFT:
                page = scroller_info->center_neighbor_left;
-               if (page == NULL) {
+               if (page == NULL)
                        page = scroller_get_left_page(scroller, scroller_info->center);
-               }
+
                break;
        case SCROLLER_PUSH_TYPE_CENTER_NEIGHBOR_RIGHT:
                page = scroller_info->center_neighbor_right;
-               if (page == NULL) {
+               if (page == NULL)
                        page = scroller_get_right_page(scroller, scroller_info->center);
-               }
+
                break;
        default:
                _E("Unsupported push-type:%d", push_type);
@@ -2112,9 +2087,8 @@ static Eina_Bool _bring_in_center_timer_cb(void *data)
                retv_if(!page_info, ECORE_CALLBACK_RENEW);
 
                if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
-                       for (i = 0; i < PAGE_DIRECTION_ANY; i++) {
+                       for (i = 0; i < PAGE_DIRECTION_ANY; i++)
                                multi_index_bring_in_page(scroller_info->index[i], page);
-                       }
                } else {
                        index_bring_in_page(scroller_info->single_index, page);
                }
@@ -2305,9 +2279,8 @@ static inline void _page_region_show(Evas_Object *scroller, int index, scroller_
        if (is_freezed && cur_freezed) scroller_freeze(scroller);
 
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
-               for (i = 0; i < PAGE_DIRECTION_ANY; i++) {
+               for (i = 0; i < PAGE_DIRECTION_ANY; i++)
                        multi_index_bring_in_page(scroller_info->index[i], page);
-               }
        } else {
                index_bring_in_page(scroller_info->single_index, page);
        }
@@ -2496,10 +2469,7 @@ static Evas_Object *_pop_page_in_list(Eina_List **list, const char *id, const ch
                        return page;
                }
 
-               if (subid
-                       && page_info->subid
-                       && !strcmp(subid, page_info->subid))
-               {
+               if (subid && page_info->subid && !strcmp(subid, page_info->subid)) {
                        *list = eina_list_remove(*list, page);
                        return page;
                }
@@ -2525,9 +2495,8 @@ static page_info_s *_get_page_info_in_list(page_info_s *scroller_page_info, Eina
 
                if (!strcmp(scroller_page_info->id, page_info->id)) {
                        if (((scroller_page_info->subid && page_info->subid)
-                                && !strcmp(scroller_page_info->subid, page_info->subid))
-                                || (!scroller_page_info->subid && !page_info->subid))
-                       {
+                                               && !strcmp(scroller_page_info->subid, page_info->subid))
+                                       || (!scroller_page_info->subid && !page_info->subid)) {
                                return page_info;
                        }
                }
@@ -2556,9 +2525,8 @@ static Evas_Object *_get_page_in_list(page_info_s *page_info, Eina_List *list)
 
                if (!strcmp(scroller_page_info->id, page_info->id)) {
                        if (((scroller_page_info->subid && page_info->subid)
-                                && !strcmp(scroller_page_info->subid, page_info->subid))
-                                || (!scroller_page_info->subid && !page_info->subid))
-                       {
+                                               && !strcmp(scroller_page_info->subid, page_info->subid))
+                                       || (!scroller_page_info->subid && !page_info->subid)) {
                                return scroller_page_info->page;
                        }
                }
@@ -2634,17 +2602,17 @@ HAPI void scroller_read_favorites_list(Evas_Object *scroller, Eina_List *page_in
                } else {
                        /* Page create */
                        page_info->item = widget_create(scroller, page_info->id, page_info->subid, page_info->period);
-                       ret_if (!page_info->item);
+                       ret_if(!page_info->item);
                        widget_viewer_evas_disable_loading(page_info->item);
                        evas_object_resize(page_info->item, scroller_info->page_width, scroller_info->page_height);
                        evas_object_size_hint_min_set(page_info->item, scroller_info->page_width, scroller_info->page_height);
                        evas_object_show(page_info->item);
 
                        page_info->page = page_create(scroller
-                                                                       , page_info->item
-                                                                       , page_info->id, page_info->subid
-                                                                       , scroller_info->page_width, scroller_info->page_height
-                                                                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
+                                       , page_info->item
+                                       , page_info->id, page_info->subid
+                                       , scroller_info->page_width, scroller_info->page_height
+                                       , PAGE_CHANGEABLE_BG_ON, PAGE_REMOVABLE_ON);
                        if (!page_info->page) {
                                _E("Cannot create a page");
                                evas_object_del(page_info->item);
@@ -2840,7 +2808,7 @@ HAPI Evas_Object *scroller_get_page_at(Evas_Object *scroller, int idx)
                        eina_list_free(list);
                        return page;
                }
-               position ++;
+               position++;
        }
        eina_list_free(list);
        return NULL;
@@ -2949,9 +2917,8 @@ HAPI void scroller_region_show_page_without_timer(Evas_Object *scroller, Evas_Ob
        _D("Page show now : %d(%p)", i, page);
        elm_scroller_page_show(scroller, i, 0);
        if (scroller_info->scroller_type == WIDGETS_STATE_NORMAL) {
-               for (j = 0; j < PAGE_DIRECTION_ANY; j++) {
+               for (j = 0; j < PAGE_DIRECTION_ANY; j++)
                        multi_index_bring_in_page(scroller_info->index[j], page);
-               }
        } else {
                index_bring_in_page(scroller_info->single_index, page);
        }
@@ -3163,11 +3130,11 @@ HAPI void scroller_reorder_with_list(Evas_Object *scroller, Eina_List *list, pag
        ret_if(!scroller_info);
        ret_if(!scroller_info->box);
 
-       if (scroller_info->center_neighbor_right) {
+       if (scroller_info->center_neighbor_right)
                after = scroller_info->center_neighbor_right;
-       } else {
+       else
                after = scroller_info->center;
-       }
+
        ret_if(!after);
 
        EINA_LIST_FREE(reverse_list, tmp_page) {
@@ -3194,13 +3161,14 @@ HAPI void scroller_reorder_with_list(Evas_Object *scroller, Eina_List *list, pag
        elm_box_recalculate(scroller_info->box);
        elm_box_recalculate(scroller_info->box_layout);
 
-       if (focus_page) scroller_region_show_page(scroller, focus_page, SCROLLER_FREEZE_OFF, SCROLLER_BRING_TYPE_INSTANT);
-       else _E("Cannot get the focused page");
+       if (focus_page)
+               scroller_region_show_page(scroller, focus_page, SCROLLER_FREEZE_OFF, SCROLLER_BRING_TYPE_INSTANT);
+       else
+               _E("Cannot get the focused page");
 
        scroller_info->index_update_timer = ecore_timer_add(INDEX_UPDATE_TIME, _index_update_cb, scroller);
-       if (!scroller_info->index_update_timer) {
+       if (!scroller_info->index_update_timer)
                _E("Cannot add an index update timer");
-       }
 }
 
 HAPI int scroller_get_page_index_in_list(Evas_Object *scroller, Evas_Object *page)
index f5dc9891e5e507d7914f900d8618b8cf0979110d..9d7b193374fed1174ae74ed4641bf177a20600aa 100755 (executable)
@@ -73,9 +73,8 @@ HAPI int util_launch_app(const char *appid, const char *key, const char *value)
                pid = aul_launch_app(appid, NULL);
        }
 
-       if (pid < 0) {
+       if (pid < 0)
                _E("Failed to launch %s(%d)", appid, pid);
-       }
 
        return pid;
 }
@@ -87,63 +86,51 @@ HAPI int util_feature_enabled_get(int feature)
        int is_enabled = 1;
 
        if (feature & FEATURE_CLOCK_HIDDEN_BUTTON) {
-               if (main_get_info()->is_tts) {
+               if (main_get_info()->is_tts)
                        return 0;
-               }
-               if (cooldown_mode_enabled_get() == 1) {
+               if (cooldown_mode_enabled_get() == 1)
                        return 0;
-               }
 
        } else if (feature & FEATURE_CLOCK_VISUAL_CUE) {
-               if (main_get_info()->is_tts) {
+               if (main_get_info()->is_tts)
                        return 0;
-               }
-               if (main_get_info()->is_alpm_clock_enabled == 1) {
+               if (main_get_info()->is_alpm_clock_enabled == 1)
                        return 0;
-               }
-               if (emergency_mode_enabled_get() == 1) {
+               if (emergency_mode_enabled_get() == 1)
                        return 0;
-               }
-               if (cooldown_mode_enabled_get() == 1) {
+               if (cooldown_mode_enabled_get() == 1)
                        return 0;
-               }
+
        } else if (feature & FEATURE_CLOCK_SELECTOR) {
 #ifndef ENABLE_INDICATOR_BRIEFING_VIEW
-               if (clock_manager_view_state_get(CLOCK_VIEW_TYPE_DRAWER) == 1) {
+               if (clock_manager_view_state_get(CLOCK_VIEW_TYPE_DRAWER) == 1)
                        return 0;
-               }
 #endif
-               if (main_get_info()->is_tts) {
+               if (main_get_info()->is_tts)
                        return 0;
-               }
-               if (emergency_mode_enabled_get() == 1) {
+               if (emergency_mode_enabled_get() == 1)
                        return 0;
-               }
-               if (cooldown_mode_enabled_get() == 1) {
+               if (cooldown_mode_enabled_get() == 1)
                        return 0;
-               }
+
        } else if (feature & FEATURE_APPS_BY_BEZEL_UP) {
-               if (main_get_info()->is_tts) {
+               if (main_get_info()->is_tts)
                        return 0;
-               }
 #ifndef ENABLE_INDICATOR_BRIEFING_VIEW
-               if (clock_manager_view_state_get(CLOCK_VIEW_TYPE_DRAWER) == 1) {
+               if (clock_manager_view_state_get(CLOCK_VIEW_TYPE_DRAWER) == 1)
                        return 0;
-               }
 #endif
-               if (emergency_mode_enabled_get() == 1) {
+               if (emergency_mode_enabled_get() == 1)
                        return 0;
-               }
-               if (cooldown_mode_enabled_get() == 1) {
+               if (cooldown_mode_enabled_get() == 1)
                        return 0;
-               }
+
        } else if (feature & FEATURE_APPS) {
-               if (emergency_mode_enabled_get() == 1) {
+               if (emergency_mode_enabled_get() == 1)
                        return 0;
-               }
-               if (cooldown_mode_enabled_get() == 1) {
+               if (cooldown_mode_enabled_get() == 1)
                        return 0;
-               }
+
        } else if (feature & FEATURE_CLOCK_CHANGE) {
                Evas_Object *win = main_get_info()->win;
                retv_if(win == NULL, is_enabled);
@@ -151,16 +138,14 @@ HAPI int util_feature_enabled_get(int feature)
                retv_if(layout == NULL, is_enabled);
 
                // disabled in editing
-               if (layout_is_edit_mode(layout) == 1) {
+               if (layout_is_edit_mode(layout) == 1)
                        return 0;
-               }
+
        } else if (feature & FEATURE_TUTORIAL) {
-               if (emergency_mode_enabled_get() == 1) {
+               if (emergency_mode_enabled_get() == 1)
                        return 0;
-               }
-               if (cooldown_mode_enabled_get() == 1) {
+               if (cooldown_mode_enabled_get() == 1)
                        return 0;
-               }
        }
 
        return is_enabled;
@@ -205,17 +190,17 @@ HAPI const char *util_get_file_path(enum app_subdir dir, const char *relative)
  * app_service(...)
  * {
  * if (power_key pressed) {
- *     int pid;
- *     pid = util_find_top_visible_window();
- *     if (pid == getpid()) {
- *             // if (first page) {
- *             //     LCD_OFF
- *             // } else {
- *             //     SCROLL TO THE FIRST PAGE
- *             // }
- *     } else {
- *             // elm_win_activate(my_win);
- *     }
+ *   int pid;
+ *   pid = util_find_top_visible_window();
+ *   if (pid == getpid()) {
+ *         // if (first page) {
+ *         //     LCD_OFF
+ *         // } else {
+ *         //     SCROLL TO THE FIRST PAGE
+ *         // }
+ *   } else {
+ *         // elm_win_activate(my_win);
+ *   }
  * }
  *
  */
@@ -401,19 +386,17 @@ HAPI void apps_util_launch(Evas_Object *win, const char *package, const char *na
        ret_if(NULL == package);
 
        if (!name) name = package;
-       if (LAUNCH_WITH_SPECIAL_ROUTINE && _launch_special_package(package, name)) {
+       if (LAUNCH_WITH_SPECIAL_ROUTINE && _launch_special_package(package, name))
                return;
-       }
 
        home_dbus_cpu_booster_signal_send();
 
        int ret_aul = aul_open_app(package);
        if (ret_aul < AUL_R_OK) {
 
-               if(ret_aul == AUL_R_EREJECTED && cooldown_mode_warning_get()) {
+               if (ret_aul == AUL_R_EREJECTED && cooldown_mode_warning_get()) {
                        util_create_toast_popup(win, _("IDS_SM_BODY_THE_DEVICE_TEMPERATURE_IS_TOO_HIGH"));
-               }
-               else {
+               } else {
                        char* inform;
                        char* inform_with_ret;
                        int len;
@@ -469,10 +452,9 @@ HAPI void apps_util_launch_main_operation(Evas_Object *win, const char *app_id,
        int ret = app_control_send_launch_request(service, NULL, NULL);
        if (APP_CONTROL_ERROR_NONE != ret) {
 
-               if(ret == APP_CONTROL_ERROR_LAUNCH_REJECTED && cooldown_mode_warning_get()) {
+               if (ret == APP_CONTROL_ERROR_LAUNCH_REJECTED && cooldown_mode_warning_get()) {
                        util_create_toast_popup(win, _("IDS_SM_BODY_THE_DEVICE_TEMPERATURE_IS_TOO_HIGH"));
-               }
-               else {
+               } else {
                        char* inform;
                        char* inform_with_ret;
                        int len;
@@ -520,9 +502,8 @@ HAPI void apps_util_launch_with_arg(Evas_Object *win, const char *app_id, const
        ret_if(NULL == arg);
 
        if (!name) name = app_id;
-       if (LAUNCH_WITH_SPECIAL_ROUTINE && _launch_special_package(app_id, name)) {
+       if (LAUNCH_WITH_SPECIAL_ROUTINE && _launch_special_package(app_id, name))
                return;
-       }
 
        _SD("Argument:(%s)", arg);
        int len = strlen(arg);
@@ -583,9 +564,8 @@ HAPI void apps_util_launch_with_bundle(Evas_Object *win, const char *app_id, bun
        ret_if(NULL == b);
 
        if (!name) name = app_id;
-       if (LAUNCH_WITH_SPECIAL_ROUTINE && _launch_special_package(app_id, name)) {
+       if (LAUNCH_WITH_SPECIAL_ROUTINE && _launch_special_package(app_id, name))
                return;
-       }
 
        home_dbus_cpu_booster_signal_send();
 
@@ -669,9 +649,8 @@ static void _toast_popup_destroy_cb(void *data, Evas_Object *obj, void *event_in
        ret_if(!parent);
 
        popup = evas_object_data_del(parent, DATA_KEY_POPUP);
-       if (popup) {
+       if (popup)
                evas_object_del(popup);
-       }
 }
 
 
@@ -693,7 +672,7 @@ int util_create_toast_popup(Evas_Object *parent, const char* text)
 
        elm_object_part_text_set(popup, "elm.text", text);
        elm_object_domain_translatable_part_text_set(popup, "elm.text", PROJECT, text);
-       if(main_get_info()->is_tts == EINA_FALSE)
+       if (main_get_info()->is_tts == EINA_FALSE)
                elm_popup_timeout_set(popup, UTIL_TOAST_POPUP_TIMER);
 
        image = elm_image_add(popup);
@@ -737,7 +716,7 @@ int util_create_toast_popup_from_noti(const char* text)
 
        elm_object_part_text_set(popup, "elm.text", text);
        elm_object_domain_translatable_part_text_set(popup, "elm.text", PROJECT, text);
-       if(main_get_info()->is_tts == EINA_FALSE)
+       if (main_get_info()->is_tts == EINA_FALSE)
                elm_popup_timeout_set(popup, UTIL_TOAST_POPUP_TIMER);
 
        image = elm_image_add(popup);
@@ -852,13 +831,11 @@ static char *_get_app_id(const char *pkgname)
                goto ERR;
        }
 
-       if (appid != NULL) {
+       if (appid != NULL)
                appid = strdup(appid);
-       }
 ERR:
-       if (handle != NULL) {
+       if (handle != NULL)
                pkgmgrinfo_pkginfo_destroy_pkginfo(handle);
-       }
 
        return appid;
 }
@@ -883,14 +860,12 @@ static char *_get_app_pkgname(const char *appid)
                _E("Failed to get pkgname from app info handler");
                goto ERR;
        }
-       if (pkgname != NULL) {
+       if (pkgname != NULL)
                pkgname = strdup(pkgname);
-       }
 
 ERR:
-       if (handle != NULL) {
+       if (handle != NULL)
                pkgmgrinfo_appinfo_destroy_appinfo(handle);
-       }
 
        return pkgname;
 }
@@ -947,7 +922,7 @@ HAPI int util_get_app_type(const char *appid)
        retv_if(appid == NULL, APP_TYPE_NATIVE);
 
        pkgname = _get_app_pkgname(appid);
-       if(pkgname == NULL) {
+       if (pkgname == NULL) {
                _E("Failed to get pkgname");
                goto DONE;
        }
@@ -983,9 +958,8 @@ HAPI const char *util_basename(const char *name)
 {
        int length;
        length = name ? strlen(name) : 0;
-       if (!length) {
+       if (!length)
                return ".";
-       }
 
        while (--length > 0 && name[length] != '/');
 
@@ -1021,9 +995,8 @@ HAPI void util_activate_home_window(void)
 HAPI void util_raise_home_window(int force_notify)
 {
        Evas_Object *win = main_get_info()->win;
-       if (win) {
+       if (win)
                elm_win_activate(win);
-       }
 }
 
 /* You have to free the returned value */
@@ -1048,12 +1021,12 @@ HAPI char *util_get_count_str_from_icu(int count)
 
        slen = strlen(locale_tmp);
 
-       ifslen > 0 && slen <= LOCALE_LEN)
+       if (slen > 0 && slen <= LOCALE_LEN)
                strncpy(locale, locale_tmp, slen);
 
        free(locale_tmp);
 
-       if(locale[0] != '\0') {
+       if (locale[0] != '\0') {
                p = strstr(locale, ".UTF-8");
                if (p) *p = 0;
        }
@@ -1073,10 +1046,8 @@ HAPI int util_is_arbic()
        char *locale_tmp = vconf_get_str(VCONFKEY_LANGSET);
        retv_if(!locale_tmp, 0);
 
-       if(!strncmp(locale_tmp, "ar", 2))
-       {
+       if (!strncmp(locale_tmp, "ar", 2))
                ret = 1;
-       }
 
        return ret;
 }
@@ -1090,8 +1061,8 @@ HAPI void util_uxt_scroller_set_rotary_event_enabled(Evas_Object *scroller, Eina
        Evas_Object *circle_scroller = evas_object_data_get(scroller, PRIVATE_DATE_KEY_CIRCLE_SCROLLER_OBJ);
 
        eext_rotary_object_event_activated_set(circle_scroller, enabled);
-       
-/*     if (circle_scroller == NULL) {
+#if 0
+       if (circle_scroller == NULL) {
                Eext_Circle_Surface *surf = main_get_info()->surface;
                if (surf) {
                        circle_scroller = eext_circle_object_scroller_add(scroller, surf);
@@ -1107,36 +1078,38 @@ HAPI void util_uxt_scroller_set_rotary_event_enabled(Evas_Object *scroller, Eina
                }
        } else {
                eext_rotary_object_event_activated_set(circle_scroller, enabled);
-       }*/
+       }
+#endif
 }
 
 HAPI int util_host_vender_id_get(void)
 {
        return 0;
-       //int ret = W_HOME_VENDOR_ID_UNKNOWN;
+#if 0
+       int ret = W_HOME_VENDOR_ID_UNKNOWN;
 
-/*     char *vender = vconf_get_str(VCONFKEY_WMS_HOST_STATUS_VENDOR);
+       char *vender = vconf_get_str(VCONFKEY_WMS_HOST_STATUS_VENDOR);
        if (vender) {
                if (strcmp(vender, HOME_HOST_VENDOR_LO) == 0) {
                        ret = W_HOME_VENDOR_ID_LO;
-               }
-               else if (strcmp(vender, HOME_HOST_V
-               ENDER_SAMSUNG) == 0) {
+               } else if (strcmp(vender, HOME_HOST_V
+                                       ENDER_SAMSUNG) == 0) {
                        ret = W_HOME_VENDOR_ID_SAMSUNG;
                }
 
                free(vender);
-       }*/
+       }
 
-       //return ret;
+       return ret;
+#endif
 }
 
 
 void destroy_evas_object(Evas_Object *object)
 {
-       if (object) {
+       if (object)
                evas_object_del(object);
-       }
+
        object = NULL;
 }
 
index 1a01284f1fd76a755b5e3acbedb6ecf5ca9f3aa1..30d011306b7f15f1a4a56f6177926609813aca58 100755 (executable)
@@ -96,11 +96,10 @@ static void del_cb(void *data, Evas *e, Evas_Object *widget, void *event_info)
                struct add_viewer_package *pkginfo;
 
                pkginfo = add_viewer_package_find(widget_id);
-               if (!pkginfo) {
+               if (!pkginfo)
                        _E("Add viewer has no info: %s", widget_id);
-               } else {
+               else
                        add_viewer_package_set_skip(pkginfo, 0);
-               }
        } else {
                _E("Has no widget_id?");
        }
@@ -119,13 +118,11 @@ static void _widget_updated_cb(void *data, Evas_Object *obj, void *event_info)
        int (*updated)(Evas_Object *obj);
 
        updated = evas_object_data_get(obj, TAG_UPDATED);
-       if (!updated) {
+       if (!updated)
                return;
-       }
 
-       if (updated(obj) == ECORE_CALLBACK_CANCEL) {
+       if (updated(obj) == ECORE_CALLBACK_CANCEL)
                evas_object_data_del(obj, TAG_UPDATED);
-       }
 }
 
 
@@ -136,13 +133,11 @@ static void _widget_control_scroll_cb(void *data, Evas_Object *obj, void *event_
        int (*scroll)(Evas_Object *obj, int hold);
 
        scroll = evas_object_data_get(obj, TAG_SCROLL);
-       if (!scroll) {
+       if (!scroll)
                return;
-       }
 
-       if (scroll(obj, (ev->error == WIDGET_ERROR_NONE && ev->event == WIDGET_EVENT_HOLD_SCROLL)) == ECORE_CALLBACK_CANCEL) {
+       if (scroll(obj, (ev->error == WIDGET_ERROR_NONE && ev->event == WIDGET_EVENT_HOLD_SCROLL)) == ECORE_CALLBACK_CANCEL)
                evas_object_data_del(obj, TAG_SCROLL);
-       }
 }
 
 
@@ -180,9 +175,8 @@ HAPI Evas_Object *widget_create(Evas_Object *parent, const char *id, const char
        if (!pkginfo) {
                _E("add-viewer info none: %s", id);
        } else {
-               if (add_viewer_package_is_skipped(pkginfo)) {
+               if (add_viewer_package_is_skipped(pkginfo))
                        _E("Package marked as skip");
-               }
 
                add_viewer_package_set_skip(pkginfo, 1);
                _D("Mark added: %s", id);
@@ -303,9 +297,8 @@ static void _widget_remove(Evas_Object *page)
 
        scroller_pop_page(page_info->scroller, page);
        page_destroy(page);
-       if (!main_get_info()->is_tts) {
+       if (!main_get_info()->is_tts)
                page_arrange_plus_page(scroller, 0);
-       }
 }
 
 
@@ -386,9 +379,8 @@ static void _widget_deleted_cb(void *data, Evas_Object *obj, void *event_info)
        page_info = evas_object_data_get(page, DATA_KEY_PAGE_INFO);
        ret_if(!page_info);
 
-       if (!widget_viewer_evas_is_faulted(page_info->item)) {
+       if (!widget_viewer_evas_is_faulted(page_info->item))
                _widget_remove(page);
-       }
 }
 
 
@@ -474,46 +466,37 @@ static int uninstall_cb(const char *pkgname, enum pkgmgr_status status, double v
        Eina_List *page_list;
        Evas_Object *page;
 
-       if (status != PKGMGR_STATUS_START) {
+       if (status != PKGMGR_STATUS_START)
                return 0;
-       }
 
-       if (!main_get_info()->layout) {
+       if (!main_get_info()->layout)
                return 0;
-       }
 
        layout_info = evas_object_data_get(main_get_info()->layout, DATA_KEY_LAYOUT_INFO);
-       if (!layout_info) {
+       if (!layout_info)
                return 0;
-       }
 
        scroller_info = evas_object_data_get(layout_info->scroller, DATA_KEY_SCROLLER_INFO);
-       if (!scroller_info) {
+       if (!scroller_info)
                return 0;
-       }
 
-       if (!scroller_info->box) {
+       if (!scroller_info->box)
                return 0;
-       }
 
        page_list = elm_box_children_get(scroller_info->box);
        EINA_LIST_FREE(page_list, page) {
                page_info = evas_object_data_get(page, DATA_KEY_PAGE_INFO);
-               if (!page_info) {
+               if (!page_info)
                        continue;
-               }
 
-               if (page_info->direction != PAGE_DIRECTION_RIGHT) {
+               if (page_info->direction != PAGE_DIRECTION_RIGHT)
                        continue;
-               }
 
-               if (!page_info->item) {
+               if (!page_info->item)
                        continue;
-               }
 
-               if (!widget_viewer_evas_is_faulted(page_info->item)) {
+               if (!widget_viewer_evas_is_faulted(page_info->item))
                        continue;
-               }
 
                _D("Faulted package: %s", widget_viewer_evas_get_widget_id(page_info->item));
                _widget_remove(page);
@@ -550,13 +533,11 @@ HAPI void widget_init(Evas_Object *win)
 
        widget_viewer_evas_set_option(WIDGET_VIEWER_EVAS_AUTO_RENDER_SELECTION, 1);
 
-       if (preference_get_int("memory/private/org.tizen.w-home/auto_feed", &val) >= 0) {
+       if (preference_get_int("memory/private/org.tizen.w-home/auto_feed", &val) >= 0)
                widget_viewer_evas_set_option(WIDGET_VIEWER_EVAS_EVENT_AUTO_FEED, val);
-       }
 
-       if (preference_get_int("memory/private/org.tizen.w-home/sensitive_move", &val) >= 0) {
+       if (preference_get_int("memory/private/org.tizen.w-home/sensitive_move", &val) >= 0)
                widget_viewer_evas_set_option(WIDGET_VIEWER_EVAS_SENSITIVE_MOVE, val);
-       }
 
        widget_viewer_evas_init(win);
        widget_viewer_evas_set_option(WIDGET_VIEWER_EVAS_SCROLL_X, 1);
index 524e4695331789895862d267c6b10ffc7c61fe13..87b74edf92571a066f1344222966268d255095fb 100755 (executable)
--- a/src/wms.c
+++ b/src/wms.c
 
 void wms_change_apps_order(int value)
 {
-       switch(value)
-       {
-               case W_HOME_WMS_BACKUP:
-                       _D("Backup");
-
-                       //Have to set the DONE, 3, to notify that backup is completed.
-                       vconf_set_int(VCONF_KEY_WMS_APPS_ORDER, W_HOME_WMS_DONE);
-
-                       break;
-               case W_HOME_WMS_RESOTRE:
-                       _D("Restore");
-                       break;
-               case W_HOME_WMS_DONE:
-                       _D("done");
-                       //No need to do anything
-                       break;
-               default:
-                       _E("Invalid value:[%d]", value);
-                       break;
+       switch (value) {
+       case W_HOME_WMS_BACKUP:
+               _D("Backup");
+
+               //Have to set the DONE, 3, to notify that backup is completed.
+               vconf_set_int(VCONF_KEY_WMS_APPS_ORDER, W_HOME_WMS_DONE);
+
+               break;
+       case W_HOME_WMS_RESOTRE:
+               _D("Restore");
+               break;
+       case W_HOME_WMS_DONE:
+               _D("done");
+               //No need to do anything
+               break;
+       default:
+               _E("Invalid value:[%d]", value);
+               break;
        }
 }
 
@@ -76,34 +75,32 @@ void wms_change_favorite_order(int value)
        layout_info = evas_object_data_get(layout, DATA_KEY_LAYOUT_INFO);
        ret_if(!layout_info);
 
-       switch(value)
-       {
-               case W_HOME_WMS_BACKUP:
-                       _D("Favorite Backup");
-
-                       page_info_list = scroller_write_list(layout_info->scroller);
-                       if (page_info_list) {
-                               xml_read_list(FAVORITES_ORDER_XML_PATH, page_info_list);
-                       }
-
-                       //Have to set the DONE, 3, to notify that backup is completed.
-                       vconf_set_int(VCONF_KEY_WMS_FAVORITES_ORDER, W_HOME_WMS_DONE);
-
-                       break;
-               case W_HOME_WMS_RESOTRE:
-                       _D("Favorite Restore");
-                       page_info_list = xml_write_list(FAVORITES_ORDER_XML_PATH);
-                       if (page_info_list) {
-                               scroller_read_favorites_list(layout_info->scroller, page_info_list);
-                       }
-                       break;
-               case W_HOME_WMS_DONE:
-                       _D("done");
-                       //No need to do anything
-                       break;
-               default:
-                       _E("Invalid value:[%d]", value);
-                       break;
+       switch (value) {
+       case W_HOME_WMS_BACKUP:
+               _D("Favorite Backup");
+
+               page_info_list = scroller_write_list(layout_info->scroller);
+               if (page_info_list)
+                       xml_read_list(FAVORITES_ORDER_XML_PATH, page_info_list);
+
+               //Have to set the DONE, 3, to notify that backup is completed.
+               vconf_set_int(VCONF_KEY_WMS_FAVORITES_ORDER, W_HOME_WMS_DONE);
+
+               break;
+       case W_HOME_WMS_RESOTRE:
+               _D("Favorite Restore");
+               page_info_list = xml_write_list(FAVORITES_ORDER_XML_PATH);
+               if (page_info_list)
+                       scroller_read_favorites_list(layout_info->scroller, page_info_list);
+
+               break;
+       case W_HOME_WMS_DONE:
+               _D("done");
+               //No need to do anything
+               break;
+       default:
+               _E("Invalid value:[%d]", value);
+               break;
        }
 }
 
index b220c721985047629e0d36bd1ad9aaffaf20383a..d8c585eb0583d1749b9e53e9e86e21f15293eb86 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -48,7 +48,7 @@ static void _get_position_by_order(int ordering, int *row, int *cellx, int *cell
 
        *row = ordering / 4;
 
-       switch(ordering % 4) {
+       switch (ordering % 4) {
        case 0:
                *cellx = 0;
                *celly = 0;
@@ -110,9 +110,8 @@ static void _destroy_writer(xmlTextWriterPtr writer)
        goto_if(ret < 0, END);
 
        ret = xmlTextWriterEndDocument(writer);
-       if (ret < 0) {
+       if (ret < 0)
                _E("Cannot end the document");
-       }
 
 END:
        xmlFreeTextWriter(writer);
@@ -142,7 +141,7 @@ HAPI w_home_error_e xml_read_list(const char *xml_file, Eina_List *page_info_lis
 
                _get_position_by_order(page_info->ordering, &row, &cellx, &celly);
 
-               switch(page_info->category) {
+               switch (page_info->category) {
                case PAGE_CATEGORY_IDLE_CLOCK:
                        category = (char *) PAGE_CATEGORY_IDLE_CLOCK_STR;
                        break;
@@ -166,11 +165,11 @@ HAPI w_home_error_e xml_read_list(const char *xml_file, Eina_List *page_info_lis
                ret = xmlTextWriterWriteFormatElement(writer, BAD_CAST "packageName", "%s", page_info->id);
                goto_if(ret < 0, END);
 
-               if (page_info->subid) {
+               if (page_info->subid)
                        ret = xmlTextWriterWriteFormatElement(writer, BAD_CAST "className", "%s", page_info->subid);
-               } else {
+               else
                        ret = xmlTextWriterWriteFormatElement(writer, BAD_CAST "className", "%s", page_info->id);
-               }
+
                goto_if(ret < 0, END);
 
                ret = xmlTextWriterWriteFormatElement(writer, BAD_CAST "screen", "%d", row);
@@ -257,13 +256,13 @@ HAPI Eina_List *xml_write_list(const char *xml_file)
                        page_info = page_info_create(NULL, NULL, WIDGET_VIEWER_EVAS_DEFAULT_PERIOD);
                        goto_if(!page_info, CRITICAL_ERROR);
 
-                       if(!strcasecmp(PAGE_CATEGORY_IDLE_CLOCK_STR, name)) {
+                       if (!strcasecmp(PAGE_CATEGORY_IDLE_CLOCK_STR, name)) {
                                page_info->category = PAGE_CATEGORY_IDLE_CLOCK;
-                       } else if(!strcasecmp(PAGE_CATEGORY_FAVORITE_STR, name)) {
+                       } else if (!strcasecmp(PAGE_CATEGORY_FAVORITE_STR, name)) {
                                page_info->category = PAGE_CATEGORY_APP;
-                       } else if(!strcasecmp(PAGE_CATEGORY_APP_WIDGET_STR, name)) {
+                       } else if (!strcasecmp(PAGE_CATEGORY_APP_WIDGET_STR, name)) {
                                page_info->category = PAGE_CATEGORY_WIDGET;
-                       } else if(!strcasecmp(PAGE_CATEGORY_MORE_APPS_STR, name)) {
+                       } else if (!strcasecmp(PAGE_CATEGORY_MORE_APPS_STR, name)) {
                                page_info->category = PAGE_CATEGORY_MORE_APPS;
                        } else {
                                _E("Type is wrong.");
@@ -304,11 +303,11 @@ HAPI Eina_List *xml_write_list(const char *xml_file)
                                        page_info->subid = strdup(value);
                                        goto_if(!page_info->subid, CRITICAL_ERROR);
                                }
-                       } else if(!strcasecmp("screen", element)) {
+                       } else if (!strcasecmp("screen", element)) {
                                page_no = atoi(value);
-                       } else if(!strcasecmp("cellx", element)) {
+                       } else if (!strcasecmp("cellx", element)) {
                                cellx = atoi(value);
-                       } else if(!strcasecmp("celly", element)) {
+                       } else if (!strcasecmp("celly", element)) {
                                celly = atoi(value);
                        }
                        continue;
@@ -336,8 +335,8 @@ HAPI Eina_List *xml_write_list(const char *xml_file)
                        page_info->removable = page_info_is_removable(page_info->id);
                        page_info_list = eina_list_append(page_info_list, page_info);
                        _D("Append a package into the page_info_list : (%s:%s:%d:%d) (%d:%d:%d)"
-                               , page_info->id, page_info->subid, page_info->category, page_info->ordering
-                               , page_no, celly, cellx);
+                                       , page_info->id, page_info->subid, page_info->category, page_info->ordering
+                                       , page_no, celly, cellx);
 
                        page_info = NULL;
                        page_no = 0;
@@ -346,13 +345,13 @@ HAPI Eina_List *xml_write_list(const char *xml_file)
                }
        }
 
-       if(element) {
+       if (element) {
                _E("An element is not appended properly");
                free(element);
                element = NULL;
        }
 
-       if(page_info) {
+       if (page_info) {
                _E("A node(%s) is not appended into the page_info_list", page_info->subid);
                page_info_destroy(page_info);
                page_info = NULL;
index 521f13807725dec2a09cbde9b038abb60767ec0e..0f32809d9ae48f1a701a747b41803f78ffe2b224 100755 (executable)
@@ -136,9 +136,7 @@ static unit_case_func_t __continue_check_set_focus_contact_and_hide(void * data)
 static unit_case_func_t __continue_check_move_move(void * data)
 {
        if ((int)data > 5)
-       {
                TEST_CASE_DONE(s_info.group);
-       }
 
        int is_open = 0;
        int ret = vconf_get_int(VCONFKEY_SETAPPL_AUTO_OPEN_APPS, &is_open);
index 16ebde30a7a68d6359e45aaae3cc8e17e2011fa5..f601beb9c3f3001ef441dc40a4407eaed5c960be 100755 (executable)
@@ -119,9 +119,8 @@ unit_case_func_t __case_check_do_not_disturb(void * data)
        control_info_t *button = NULL;
 
        EINA_LIST_FOREACH(button_list, l, button) {
-               if (button->index == MOMENTS_CONTROLS_DO_NOT_DISTURB) {
+               if (button->index == MOMENTS_CONTROLS_DO_NOT_DISTURB)
                        break;
-               }
        }
 
        TEST_ASSERT_TRUE(button != NULL);
@@ -134,7 +133,7 @@ unit_case_func_t __case_check_do_not_disturb(void * data)
 
        button->pressed(NULL, NULL, NULL, NULL);
 
-       TEST_CASE_CONTINUE(0.6, __continue_check_do_not_disturb,(void*)button);
+       TEST_CASE_CONTINUE(0.6, __continue_check_do_not_disturb, (void*)button);
 }
 
 unit_case_func_t __continue_check_do_not_disturb(void * data)
@@ -259,9 +258,8 @@ unit_case_func_t __case_check_flight_mode(void * data)
        control_info_t *button = NULL;
 
        EINA_LIST_FOREACH(button_list, l, button) {
-               if (button->index == MOMENTS_CONTROLS_FLIGHT_MODE) {
+               if (button->index == MOMENTS_CONTROLS_FLIGHT_MODE)
                        break;
-               }
        }
 
        TEST_ASSERT_TRUE(button != NULL);
@@ -400,9 +398,8 @@ unit_case_func_t __case_check_volume(void * data)
        control_info_t *button = NULL;
 
        EINA_LIST_FOREACH(button_list, l, button) {
-               if (button->index == MOMENTS_CONTROLS_VOLUME) {
+               if (button->index == MOMENTS_CONTROLS_VOLUME)
                        break;
-               }
        }
 
        TEST_ASSERT_TRUE(button != NULL);
@@ -518,9 +515,8 @@ unit_case_func_t __case_check_brightness(void * data)
        control_info_t *button = NULL;
 
        EINA_LIST_FOREACH(button_list, l, button) {
-               if (button->index == MOMENTS_CONTROLS_BRIGHTNESS) {
+               if (button->index == MOMENTS_CONTROLS_BRIGHTNESS)
                        break;
-               }
        }
 
        TEST_ASSERT_TRUE(button != NULL);
index 4bef7b14d710b9375c021b3cc12c08b3606a1b74..dcb8bdbd5f8fdbe17e4493b1c73bd8663ee4977c 100755 (executable)
@@ -83,7 +83,7 @@ static unit_case_func_t __case_show_control_button(void * data)
        int i = 0;
        int count = (int)data;
 
-       for (i=0; i< count ; i++) {
+       for (i = 0; i < count; i++) {
                control_info_t *new_button =  moments_control_create_button(control_layout, i);
                TEST_ASSERT_TRUE(new_button != NULL);
                TEST_ASSERT_TRUE(new_button->button_layout != NULL);
@@ -104,7 +104,7 @@ static unit_case_func_t __continue_check_control_button(void * data)
        int i = 0;
        int count = (int)data;
 
-       for (i=0; i<count ; i++) {
+       for (i = 0; i < count; i++) {
                control_info_t *button = eina_list_nth(button_list, i);
 
                TEST_ASSERT_TRUE(button->button_layout != NULL);
index 3cdc325696d755135463ccc98e608ad8cce3aaf7..8fd56c81dbdf220132107155f093c9501985a6e7 100755 (executable)
@@ -141,9 +141,8 @@ static unit_case_func_t __case_check_layout_movement(void * data)
 
 static unit_case_func_t __continue_move_down(void * data)
 {
-       if (current_step >= 20) {
+       if (current_step >= 20)
                TEST_CASE_CONTINUE(0.05, __continue_move_up, NULL);
-       }
 
        main_s * info = main_get_info();
        TEST_ASSERT_TRUE(info != NULL);
@@ -159,9 +158,8 @@ static unit_case_func_t __continue_move_down(void * data)
 
 static unit_case_func_t __continue_move_up(void * data)
 {
-       if (current_step <= 0) {
+       if (current_step <= 0)
                TEST_CASE_CONTINUE(0.05, __continue_touch_up_and_check_hide, &START_Y);
-       }
 
        current_step -= 1;
 
@@ -354,11 +352,10 @@ static unit_case_func_t __continue_short_drag_end_and_check_state(void * data)
 
        __t__background_layout_mouse_up(START_X, DRAG_UP_BOUNDARY_Y - move_y);
 
-       if (move_y >= MOMENT_DRAW_LIMIT) {
+       if (move_y >= MOMENT_DRAW_LIMIT)
                TEST_CASE_CONTINUE(0.6, __continue_check_bar_state_hide, NULL);
-       } else {
+       else
                TEST_CASE_CONTINUE(0.6, __continue_check_bar_state_full, NULL);
-       }
 }
 
 static unit_case_func_t __case_drag_up_check_full_boundary(void * data)
index 19e5b370602d74d239136afb49575dc2e42b146c..57635c33f20d11c3960f555c5a914479706160ab 100755 (executable)
@@ -176,14 +176,15 @@ static unit_case_func_t __continue_check_status_battery_icon_change(void *data)
        TEST_ASSERT_EQUAL_STRING(battery_text, elm_object_part_text_get(layout, "txt.battery"));
        TEST_ASSERT_EQUAL_STRING(battery_percent, edje_object_part_state_get(elm_layout_edje_get(battery), "icon_image", &val));
        if (percent % 2) {
-               TEST_ASSERT_EQUAL_STRING("show", edje_object_part_state_get(elm_layout_edje_get(battery), "battery_charge_image", &val));
+               TEST_ASSERT_EQUAL_STRING("show",
+                               edje_object_part_state_get(elm_layout_edje_get(battery), "battery_charge_image", &val));
        } else {
-               TEST_ASSERT_EQUAL_STRING("default", edje_object_part_state_get(elm_layout_edje_get(battery), "battery_charge_image", &val));
+               TEST_ASSERT_EQUAL_STRING("default",
+                               edje_object_part_state_get(elm_layout_edje_get(battery), "battery_charge_image", &val));
        }
-       
-       if (percent >= 100) {
+
+       if (percent >= 100)
                TEST_CASE_DONE(s_info.group);
-       }
 
        percent += 5;
        __set_battery_percent(percent);
@@ -233,9 +234,8 @@ static unit_case_func_t __continue_check_status_callsignal_icon_change(void *dat
 
        TEST_ASSERT_EQUAL_STRING(__callsignal_type[call_signal_index], edje_object_part_state_get(elm_layout_edje_get(callsignal), "icon_image", &val));
 
-       if (strength == 5 && !is_roaming) {
+       if (strength == 5 && !is_roaming)
                TEST_CASE_DONE(s_info.group);
-       }
 
        if (strength < 4) {
                strength += 1;
@@ -306,7 +306,8 @@ static unit_case_func_t __continue_check_status_network_icon_change(void *data)
        TEST_ASSERT_EQUAL_STRING(__network_type[network_state->network_type], edje_object_part_state_get(elm_layout_edje_get(network), "type_icon_image", &val));
        TEST_ASSERT_EQUAL_STRING(__network_type[network_state->packet_type], edje_object_part_state_get(elm_layout_edje_get(network), "inout_icon_image", &val));
 
-       if (network_state->network_type == NETWORK_TYPE_INDEX_END && network_state->packet_type == NETWORK_PACKET_TYPE_INDEX_END) {
+       if (network_state->network_type == NETWORK_TYPE_INDEX_END
+                       && network_state->packet_type == NETWORK_PACKET_TYPE_INDEX_END) {
                TEST_CASE_DONE(s_info.group);
        }
 
@@ -363,9 +364,9 @@ static unit_case_func_t __continue_check_status_bluetooth_icon_change(void *data
        if (bt_connected < 2) {
                TEST_ASSERT_EQUAL_STRING(__bluetooth_state[bt_connected], edje_object_part_state_get(elm_layout_edje_get(bluetooth), "icon_image", &val));
 
-               if (bt_connected == 1) // This time we should show off state
+               if (bt_connected == 1) // This time we should show off state
                        bt_on_off = 0;
-               }
+
                bt_connected++;
 
                moments_status_bluetooth_update(bt_on_off, bt_connected);
index 38e33e4157d6adafc02d0f5c2accc940844b14ba..715fd58f60915498e797466721c64a910af1d460 100755 (executable)
@@ -37,13 +37,15 @@ static struct {
        .group = NULL,
 };
 
-position_t icon_position[7][7] = {     {{0,0}},
-                                                                       {{148, 288}},
-                                                                       {{184, 284}, {112, 284}},
-                                                                       {{230, 262}, {148, 288}, {66, 262}},
-                                                                       {{247, 247}, {184, 284}, {112, 284}, {49, 247}},
-                                                                       {{282, 191}, {230, 262}, {148, 288}, {66, 262}, {14, 191}},
-                                                                       {{284, 184}, {247, 247}, {184, 284}, {112, 284}, {49, 247}, {12, 184}} };
+position_t icon_position[7][7] = {
+       { {0, 0} },
+       { {148, 288} },
+       { {184, 284}, {112, 284} },
+       { {230, 262}, {148, 288}, {66, 262} },
+       { {247, 247}, {184, 284}, {112, 284}, {49, 247} },
+       { {282, 191}, {230, 262}, {148, 288}, {66, 262}, {14, 191} },
+       { {284, 184}, {247, 247}, {184, 284}, {112, 284}, {49, 247}, {12, 184} }
+};
 
 
 static void __set_up(void)
@@ -185,7 +187,7 @@ static unit_case_func_t __case_control_button_create(void * data)
                TEST_ASSERT_TRUE(bar != NULL);
 
                break;
-       default :
+       default:
                break;
        }
 
index 6ce4d0d9453b3482797101788cca9cedfd291fc5..1b589b027f8f985e7e34ab9f0d29bd1eb20882d2 100755 (executable)
@@ -85,9 +85,8 @@ int main(int argc, char *argv[])
        lifecycle_callback.terminate = __terminate;
 
        int ret = ui_app_main(argc, argv, &lifecycle_callback, NULL);
-       if (ret != APP_ERROR_NONE) {
+       if (ret != APP_ERROR_NONE)
                __T("app_main() is failed. err = %d", ret);
-       }
 
        return 0;
 }
index b252bfad49273926c3a6843bc1d5b687cfa10e75..61f55fb89606557a22ff2856e3bf38da1558f1dd 100755 (executable)
 #define unit_case_func_t Eina_Bool
 
 #define TEST_CASE(__group, __case_starter) { \
-                       bool is_passed = false; \
-                       __set_up(); \
-                       __case_starter(&is_passed); \
-                       __tear_down(); \
-                       if (is_passed) unit_result_pass((__group)->result); \
-                       else unit_result_fail((__group)->result); \
-               }
+       bool is_passed = false; \
+       __set_up(); \
+       __case_starter(&is_passed); \
+       __tear_down(); \
+       if (is_passed) unit_result_pass((__group)->result); \
+       else unit_result_fail((__group)->result); \
+}
 
 void unit_init(void);
 void unit_fini(void);
index c06c1a97c1a23194d32dca875126c09c1c226273..79e17f388231e6838f5592f3c54966896afab3f8 100755 (executable)
 #include <tizen.h>
 
 #define TEST_ASSERT_TRUE(value) { \
-               bool __ret = unit_assert_true((value), (__FUNCTION__), (__LINE__)); \
-               if (!__ret) { \
-                       TEST_CASE_FAIL(); \
-                       return EINA_FALSE; \
-               } \
-       }
+       bool __ret = unit_assert_true((value), (__FUNCTION__), (__LINE__)); \
+       if (!__ret) { \
+               TEST_CASE_FAIL(); \
+               return EINA_FALSE; \
+       } \
+}
 #define TEST_ASSERT_EQUAL_INT(expected_value, input_value) { \
-               bool __ret = unit_assert_equal_int((expected_value), (input_value), (__FUNCTION__), (__LINE__)); \
-               if (!__ret) { \
-                       TEST_CASE_FAIL(); \
-                       return EINA_FALSE; \
-               } \
-       }
+       bool __ret = unit_assert_equal_int((expected_value), (input_value), (__FUNCTION__), (__LINE__)); \
+       if (!__ret) { \
+               TEST_CASE_FAIL(); \
+               return EINA_FALSE; \
+       } \
+}
 #define TEST_ASSERT_EQUAL_DOUBLE(expected_value, input_value) { \
-               bool __ret = unit_assert_equal_double((expected_value), (input_value), (__FUNCTION__), (__LINE__)); \
-               if (!__ret) { \
-                       TEST_CASE_FAIL(); \
-                       return EINA_FALSE; \
-               } \
-       }
+       bool __ret = unit_assert_equal_double((expected_value), (input_value), (__FUNCTION__), (__LINE__)); \
+       if (!__ret) { \
+               TEST_CASE_FAIL(); \
+               return EINA_FALSE; \
+       } \
+}
 #define TEST_ASSERT_EQUAL_STRING(expected_value, input_value) { \
-               bool __ret = unit_assert_equal_string((expected_value), (input_value), (__FUNCTION__), (__LINE__)); \
-               if (!__ret) { \
-                       TEST_CASE_FAIL(); \
-                       return EINA_FALSE; \
-               } \
-       }
+       bool __ret = unit_assert_equal_string((expected_value), (input_value), (__FUNCTION__), (__LINE__)); \
+       if (!__ret) { \
+               TEST_CASE_FAIL(); \
+               return EINA_FALSE; \
+       } \
+}
 #define TEST_ASSERT_EQUAL_OBJECT(expected_value, input_value, compare_func) { \
-               bool __ret = unit_assert_equal_object((expected_value), (input_value), (compare_func), (__FUNCTION__), (__LINE__)); \
-               if (!__ret) { \
-                       TEST_CASE_FAIL(); \
-                       return EINA_FALSE; \
-               } \
-       }
+       bool __ret = unit_assert_equal_object((expected_value), (input_value), (compare_func), (__FUNCTION__), (__LINE__)); \
+       if (!__ret) { \
+               TEST_CASE_FAIL(); \
+               return EINA_FALSE; \
+       } \
+}
 #define TEST_ASSERT_EQUAL_LOG(input_value) { \
-               bool __ret = unit_equal_log((input_value), (__FUNCTION__), (__LINE__)); \
-               if (!__ret) { \
-                       TEST_CASE_FAIL(); \
-                       return EINA_FALSE; \
-               } \
-       }
+       bool __ret = unit_equal_log((input_value), (__FUNCTION__), (__LINE__)); \
+       if (!__ret) { \
+               TEST_CASE_FAIL(); \
+               return EINA_FALSE; \
+       } \
+}
 
 bool unit_assert_true(const int value, const char * func, const int line);
 bool unit_assert_equal_int(const int expected_value, const int input_value, const char * func, const int line);
index 16097f8d6426f9453709fb2b8297f24d7c7e9c79..d9f577f36e837a5eecf83d8c70ba646e6c7400e4 100755 (executable)
@@ -26,7 +26,7 @@ static Eina_Bool __unit_test_clear_log(void);
 
 void unit_test_log_buf_function(void)
 {
-       __unit_test_run_function( __unit_test_write_log() == EINA_TRUE);
+       __unit_test_run_function(__unit_test_write_log() == EINA_TRUE);
        __unit_test_run_function(__unit_test_clear_log() == EINA_TRUE);
 }
 
index 698a8de9397f93af3a966a7e9fc728f7a2a7f62b..b1817bd4fa580a859257f4964bd681934250bd64 100755 (executable)
@@ -61,9 +61,8 @@ int main(int argc, char *argv[])
        lifecycle_callback.terminate = __terminate;
 
        int ret = ui_app_main(argc, argv, &lifecycle_callback, NULL);
-       if (ret != APP_ERROR_NONE) {
+       if (ret != APP_ERROR_NONE)
                __T("app_main() is failed. err = %d", ret);
-       }
 
        return 0;
 }