Added exception code at watch face.

Change-Id: I42df667b4675a9401de8d14cef2535736053c4d9
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/include/setting_debug.h b/include/setting_debug.h
index f8d99f24674133711ba08bbd660345030fea2b77..8efbb39b80521e7d50e0e62213ffe19fb1b537cc 100644 (file)
--- a/include/setting_debug.h
+++ b/include/setting_debug.h
@@ -66,17 +66,17 @@
        } while (0);
 
 #define setting_retv_if(expr, val) do { \
-       if (expr) { \
-               ERR("(%s)", #expr); \
-               return (val); \
-       } \
-} while (0)
+               if (expr) { \
+                       ERR("(%s)", #expr); \
+                       return (val); \
+               } \
+       } while (0)
 
 #define setting_ret_if(expr) do { \
-       if (expr) { \
-               ERR("(%s)", #expr); \
-               return ; \
-       } \
-} while (0)
+               if (expr) { \
+                       ERR("(%s)", #expr); \
+                       return ; \
+               } \
+       } while (0)
 
 #endif

diff --git a/include/util.h b/include/util.h
index 4bcaec00239d212df2866e9a9e3f21d79fc3bde7..f62f6c0fcce500bc3701574617788c40ff2143fb 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -62,7 +62,7 @@ char *_get_strnum_from_icu(int number);
                if (arg) { \
                        int error_no = 0; \
                        error_no = app_control_send_terminate_request(arg); \
-                       ERR( #arg " app_control error no : %d",  error_no); \
+                       ERR(#arg " app_control error no : %d",   error_no); \
                        app_control_destroy(arg); \
                        arg = NULL; \
                } \

diff --git a/src/setting-clock.c b/src/setting-clock.c
index efe256501fd9301cdf4fa67f3961cd8f0ca40c53..15f9b5b58c6b3d4a8fde91039a9f39b240cd0950 100644 (file)
--- a/src/setting-clock.c
+++ b/src/setting-clock.c
@@ -780,9 +780,12 @@ static int _category_app_list_cb(pkgmgrinfo_appinfo_h handle, void *user_data)
                ret = pkgmgrinfo_appinfo_foreach_metadata(tmp_handle, watch_metadata_func, (void *)(&clock_metadata));
 
                pitem->appid = strdup(appid);
-               pitem->pkgid = strdup(pkgid);
-               pitem->name = strdup(name);
-               pitem->icon = strdup(icon);
+               if (pkgid != NULL)
+                       pitem->pkgid = strdup(pkgid);
+               if (name != NULL)
+                       pitem->name = strdup(name);
+               if (icon != NULL)
+                       pitem->icon = strdup(icon);
 
                if (m_value && clock_metadata.value && strlen(m_value) > 0) {
                        if (!strcmp(m_value, "function")) {

diff --git a/src/setting-connection.c b/src/setting-connection.c
index d3054e6c768a234358a2394481234f5ac62bf87c..dabb762d0a80541b5c7227606bc12e953e0ae12f 100644 (file)
--- a/src/setting-connection.c
+++ b/src/setting-connection.c
@@ -439,9 +439,9 @@ char *_gl_connection_title_get(void *data, Evas_Object *obj, const char *part)
                        vconf_get_bool(VCONFKEY_NFC_STATE, &val);
                        snprintf(buf, sizeof(buf) - 1, text_color, val ? _("IDS_COM_BODY_ON_ABB") : _("IDS_COM_BODY_OFF_ABB_M_STATUS"));
                        break;
-                       /*              case SETTING_CONNECTION_BT_ALERTS: */
-                       /*                      snprintf(buf, sizeof(buf) - 1, "Receive BT disconnection alerts."); */
-                       /*                      break; */
+               /*              case SETTING_CONNECTION_BT_ALERTS: */
+               /*                      snprintf(buf, sizeof(buf) - 1, "Receive BT disconnection alerts."); */
+               /*                      break; */
                case SETTING_CONNECTION_TIZEN_CONNECT:
                        ret = conv_internal_get_activation_state(&val);
                        if (ret != CONV_ERROR_NONE) {

diff --git a/src/setting-device.c b/src/setting-device.c
index c77c282756da9dcbbd7ffae36142a475eb77418c..72928143e167fe34ca82785b163023b507ec4406 100644 (file)
--- a/src/setting-device.c
+++ b/src/setting-device.c
@@ -335,7 +335,7 @@ static void change_double_press_home_key_cb(keynode_t *key, void *data)
        }
 }
 
-void init_double_press_home_key(void * data)
+void init_double_press_home_key(void *data)
 {
        appdata *ad = data;
        register_vconf_changing(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, change_double_press_home_key_cb, ad);
@@ -343,7 +343,7 @@ void init_double_press_home_key(void * data)
 
 void clear_double_press_home_key(void *data, Evas_Object *obj, void *event_info)
 {
-       if(g_double_press_home_key_genlist) {
+       if (g_double_press_home_key_genlist) {
                Elm_Object_Item *first = elm_genlist_first_item_get(g_double_press_home_key_genlist);
                elm_object_item_signal_emit(first, "elm,action,title,slide,stop", "elm");
        }
@@ -759,11 +759,11 @@ Evas_Object *_show_double_press_home_key_list(void *data)
        title_item->item_style = "title";
        title_item->func.del = NULL;
 
-       elm_genlist_item_append(genlist, title_item, (void*)DEVICE_TITLE_DOUBLE_PRESS_HOME_KEY, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_append(genlist, title_item, (void *)DEVICE_TITLE_DOUBLE_PRESS_HOME_KEY, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
        elm_genlist_item_class_free(title_item);
 
-       for(i = 0; i < 3; i++) {
+       for (i = 0; i < 3; i++) {
                Item_Data *id = calloc(sizeof(Item_Data), 1);
                if (id) {
                        id->index = i;

diff --git a/src/setting-display.c b/src/setting-display.c
index b722dac12a34345ee9fec70ebe61195fa14221e6..e15888c81804e0d4c66e156d1d6f6f9e486d164f 100644 (file)
--- a/src/setting-display.c
+++ b/src/setting-display.c
@@ -376,8 +376,8 @@ char *_gl_display_title_get(void *data, Evas_Object *obj, const char *part)
                        snprintf(buf, sizeof(buf) - 1, "%s", _(display_menu_its[index].name));
                }
        } else if (!strcmp(part, "elm.text.1")) {
-                       char *text_color = "<font color=#4DCFFFC9>%s</font>";
-                       const char *curr_lang = setting_get_lang_title();
+               char *text_color = "<font color=#4DCFFFC9>%s</font>";
+               const char *curr_lang = setting_get_lang_title();
                if (id->item == edit_icon_item) {
                        char *str = _get_homeview_type_subtitle();
                        snprintf(buf, sizeof(buf) - 1, text_color, str);
@@ -1087,7 +1087,7 @@ void _show_font_list(void *data)
                                font_style_item = id->item;
                        }
                        if (idx == 1) {
-                               font_size_item  = id->item;
+                               font_size_item  = id->item;
                        }
                }
        }
@@ -1879,7 +1879,7 @@ static void _display_brightness_cb(void *data, Evas_Object *obj, void *event_inf
        }
 }
 
-static void _change_btn_img(void *data, Evas_Object *btn_obj, char * path, char * btn_str)
+static void _change_btn_img(void *data, Evas_Object *btn_obj, char *path, char *btn_str)
 {
        char img_path[PATH_MAX];
        Evas_Object *page_layout = (Evas_Object *)data;
@@ -2026,7 +2026,7 @@ static void _press_minus_brightness_cb(void *data, Evas_Object *obj, void *event
        change_brightness(brightness_index);
 }
 
-static char*
+static char *
 _accessible_name_cb(void *data, Evas_Object *obj)
 {
        Evas_Object *layout = data;
@@ -2034,12 +2034,12 @@ _accessible_name_cb(void *data, Evas_Object *obj)
        return strdup(elm_object_part_text_get(layout, "elm.text.slider"));
 }
 
-static char*
+static char *
 _accessible_name_cb_img(void *data, Evas_Object *obj)
 {
-       char buf[1024] ={0,};
-       int text_num = *(int*)data;
-       switch(text_num) {
+       char buf[1024] = {0,};
+       int text_num = *(int *)data;
+       switch (text_num) {
        case 1:
                snprintf(buf, sizeof(buf)-1, "Decrease %s Button", _("IDS_ST_BUTTON_BRIGHTNESS"));
                break;
@@ -2058,13 +2058,13 @@ _accessible_name_cb_img(void *data, Evas_Object *obj)
 }
 
 
-static char*
+static char *
 _accessible_slider_name_cb(void *data, Evas_Object *obj)
 {
        return strdup(_("IDS_ST_BUTTON_BRIGHTNESS"));
 }
 
-static char*
+static char *
 _accessible_slider_description_cb(void *data, Evas_Object *obj)
 {
        char buf[PATH_MAX];
@@ -2075,7 +2075,7 @@ _accessible_slider_description_cb(void *data, Evas_Object *obj)
 
 
 static void
-_img_accessible_register(Evas_Object *layout, Evas_Object *img, int* val)
+_img_accessible_register(Evas_Object *layout, Evas_Object *img, int *val)
 {
        Evas_Object *ao_btn;
        ao_btn = elm_access_object_register(img, layout);
@@ -2152,8 +2152,8 @@ Evas_Object *_show_brightness_popup(void *data, Evas_Object *obj, void *event_in
        ao = elm_access_object_register(to, page_layout);
        elm_atspi_accessible_name_cb_set(ao, _accessible_name_cb, page_layout);
        elm_atspi_accessible_reading_info_type_set(ao, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
-       elm_atspi_accessible_name_cb_set(slider,_accessible_slider_name_cb, NULL);
-       elm_atspi_accessible_description_cb_set(slider,_accessible_slider_description_cb, NULL);
+       elm_atspi_accessible_name_cb_set(slider, _accessible_slider_name_cb, NULL);
+       elm_atspi_accessible_description_cb_set(slider, _accessible_slider_description_cb, NULL);
 
        Evas_Object *btn_minus;
        btn_minus = elm_image_add(page_layout);
@@ -2214,7 +2214,7 @@ Evas_Object *_show_brightness_popup(void *data, Evas_Object *obj, void *event_in
        Evas_Object *to_bottom_text = (Evas_Object *)edje_object_part_object_get((const Edje_Object *)elm_layout_edje_get(page_layout), "elm.text.bottom");
        Evas_Object *ao_bottom_text = elm_access_object_register(to_bottom_text, page_layout);
        elm_atspi_accessible_reading_info_type_set(ao_bottom_text, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
-       elm_atspi_accessible_name_cb_set(ao_bottom_text,_accessible_name_cb_img, &brightness_name);
+       elm_atspi_accessible_name_cb_set(ao_bottom_text, _accessible_name_cb_img, &brightness_name);
 
        /* Make unselect state all of the pages except first one */
        elm_object_signal_emit(page_layout, "elm,state,thumbnail,unselect", "elm");

diff --git a/src/setting-double.c b/src/setting-double.c
index b2aaedc579f2d366c050f17f66f99c4dd12f11bd..2176b7e7352f7a5c9cecfea2815129c1110de810 100644 (file)
--- a/src/setting-double.c
+++ b/src/setting-double.c
@@ -99,14 +99,14 @@ static int _sort_app_list_cb(const void *d1, const void *d2)
        i18n_ucollator_str_collator(coll, app1, -1, app2, -1, &ret);
 
        switch (ret) {
-               case I18N_UCOLLATOR_EQUAL:
-                       return 0;
-               case I18N_UCOLLATOR_GREATER:
-                       return 1;
-               case I18N_UCOLLATOR_LESS:
-                       return -1;
-               default:
-                       return 0;
+       case I18N_UCOLLATOR_EQUAL:
+               return 0;
+       case I18N_UCOLLATOR_GREATER:
+               return 1;
+       case I18N_UCOLLATOR_LESS:
+               return -1;
+       default:
+               return 0;
        }
 }
 
@@ -248,22 +248,19 @@ static char *_gl_double_app_title_get(void *data, Evas_Object *obj, const char *
 {
        Double_Item_Data *id = data;
 
-       if (id && id->pitem)
-       {
-               if (id->pitem->index >= 0)
-               {
+       if (id && id->pitem) {
+               if (id->pitem->index >= 0) {
                        DBG("--------------------------------");
                        DBG("index : %d", id->pitem->index);
                        DBG("--------------------------------");
                        if (id->pitem->index >= 0 && id->pitem->name && !strcmp(part, "elm.text")) {
-                               switch(id->pitem->index)
-                               {
-                                       case VCONFKEY_DOUBLE_PRESS_HOME_KEY_NONE:
-                                               return strdup(_("IDS_LCKSCN_BODY_NONE"));
-                                       case VCONFKEY_DOUBLE_PRESS_HOME_KEY_RECENT_APPS:
-                                               return strdup(_("IDS_ST_OPT_RECENT_APPS_ABB"));
-                                       case VCONFKEY_DOUBLE_PRESS_HOME_KEY_LAST_APP:
-                                               return strdup("Last app");
+                               switch (id->pitem->index) {
+                               case VCONFKEY_DOUBLE_PRESS_HOME_KEY_NONE:
+                                       return strdup(_("IDS_LCKSCN_BODY_NONE"));
+                               case VCONFKEY_DOUBLE_PRESS_HOME_KEY_RECENT_APPS:
+                                       return strdup(_("IDS_ST_OPT_RECENT_APPS_ABB"));
+                               case VCONFKEY_DOUBLE_PRESS_HOME_KEY_LAST_APP:
+                                       return strdup("Last app");
                                }
                        }
                } else {
@@ -439,7 +436,7 @@ static void update_double_app_list(void *data)
 
        if (g_double_app_genlist) {
                struct _double_menu_item *selected_app = NULL;
-/*             Elm_Object_Item *sel_it = NULL; */
+               /*              Elm_Object_Item *sel_it = NULL; */
 
                elm_genlist_clear(g_double_app_genlist);
 

diff --git a/src/setting-info.c b/src/setting-info.c
index b863059416ab89c63d3d55d82a2551cf9909f33a..12abe319bf43b8c380725c943c68f0b198c8ab59 100644 (file)
--- a/src/setting-info.c
+++ b/src/setting-info.c
@@ -34,8 +34,8 @@ static struct _info_menu_item info_menu_its[] = {
 };
 
 static struct _info_menu_item developer_options_menu_its[] = {
-       { "On Pixel Ratio",             0,       NULL},
-       { "Disable developer mode",             0,       _gl_disable_developer_mode_cb},
+       { "On Pixel Ratio",                             0,               NULL},
+       { "Disable developer mode",                             0,               _gl_disable_developer_mode_cb},
 };
 
 static struct _info_menu_item _info_detail_menu_list[] = {
@@ -594,10 +594,10 @@ void _info_open_develop_menu_cb(void *data, Evas_Object *obj, void *event_info)
 
        ERR("Push Serial Number! %d", ad->cnt_touch_serial_number);
 
-       if(ad->cnt_touch_serial_number >= 5) {
+       if (ad->cnt_touch_serial_number >= 5) {
                int val = 0;
                vconf_get_bool(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, &val);
-               if(val == 0) {
+               if (val == 0) {
                        val = 1;
                        vconf_set_bool(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, val);
                        insert_develop_genlist_item(ad);
@@ -883,76 +883,75 @@ static Eina_Bool _get_imei_serial_info(char *pszBuf, int bufSize)
 static char *
 _gl_developer_opt_title_text_get(void *data, Evas_Object *obj, const char *part)
 {
-       char buf[1024];
+       char buf[1024];
 
-       snprintf(buf, 1023, "%s", "Developer options");
-       return strdup(buf);
+       snprintf(buf, 1023, "%s", "Developer options");
+       return strdup(buf);
 }
 
 void _clear_developer_option_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       g_developer_option_genlist = NULL;
+       g_developer_option_genlist = NULL;
 
-       return;
+       return;
 }
 
 char *_gl_develop_options_title_get(void *data, Evas_Object *obj, const char *part)
 {
-       char buf[1024] = {0,};
-       Info_Item_Data *id = data;
-       int index = id->index;
-
-       if (!strcmp(part, "elm.text")) {
-               snprintf(buf, sizeof(buf) - 1, "%s", _(developer_options_menu_its[index].name));
-       }
-        else if (!strcmp(part, "elm.text.1")) {
-               snprintf(buf, sizeof(buf) - 1, "%s", "Show on AOD");
-        }
-       return strdup(buf);
+       char buf[1024] = {0,};
+       Info_Item_Data *id = data;
+       int index = id->index;
+
+       if (!strcmp(part, "elm.text")) {
+               snprintf(buf, sizeof(buf) - 1, "%s", _(developer_options_menu_its[index].name));
+       } else if (!strcmp(part, "elm.text.1")) {
+               snprintf(buf, sizeof(buf) - 1, "%s", "Show on AOD");
+       }
+       return strdup(buf);
 }
 
 
 
 void _AOD_OPR_chk_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       DBG("Setting - _AOD_OPR_chk_changed_cb");
+       DBG("Setting - _AOD_OPR_chk_changed_cb");
 
-       int wrote_val = 0;
+       int wrote_val = 0;
 
-       vconf_get_bool(VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO, &wrote_val);
+       vconf_get_bool(VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO, &wrote_val);
 
-       wrote_val = !wrote_val;
+       wrote_val = !wrote_val;
 
-       vconf_set_bool(VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO, wrote_val);
+       vconf_set_bool(VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO, wrote_val);
 }
 
 Evas_Object *_gl_AOD_OPR_check_get(void *data, Evas_Object *obj, const char *part)
 {
-       Evas_Object *check = NULL;
-       /*appdata *ad = data; */
+       Evas_Object *check = NULL;
+       /*appdata *ad = data; */
 
-       Info_Item_Data *id = data;
-       int index = id->index;
+       Info_Item_Data *id = data;
+       int index = id->index;
 
-       if (!strcmp(part, "elm.icon")) {
-               int wrote_val = 0;
-               check = elm_check_add(obj);
-               elm_object_style_set(check, "on&off");
+       if (!strcmp(part, "elm.icon")) {
+               int wrote_val = 0;
+               check = elm_check_add(obj);
+               elm_object_style_set(check, "on&off");
 
-               vconf_get_bool(VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO, &wrote_val);
+               vconf_get_bool(VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO, &wrote_val);
 
-               elm_check_state_set(check, wrote_val ? EINA_TRUE : EINA_FALSE);
-               evas_object_smart_callback_add(check, "changed", _AOD_OPR_chk_changed_cb, NULL);
-               evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_propagate_events_set(check, EINA_FALSE);
-               evas_object_repeat_events_set(check, EINA_TRUE);
+               elm_check_state_set(check, wrote_val ? EINA_TRUE : EINA_FALSE);
+               evas_object_smart_callback_add(check, "changed", _AOD_OPR_chk_changed_cb, NULL);
+               evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_propagate_events_set(check, EINA_FALSE);
+               evas_object_repeat_events_set(check, EINA_TRUE);
 
-               id->check = check;
+               id->check = check;
 
-               index++;
-       }
-       return check;
+               index++;
+       }
+       return check;
 }
 
 Evas_Object *_create_developer_option_list(void *data)
@@ -969,13 +968,13 @@ Evas_Object *_create_developer_option_list(void *data)
        temp_ad = ad;
 
        elm_theme_extension_add(NULL, EDJE_PATH);
-       Elm_Genlist_Item_Class *itc_OPR= elm_genlist_item_class_new();
+       Elm_Genlist_Item_Class *itc_OPR = elm_genlist_item_class_new();
        itc_OPR->item_style = "2text.1icon.1";
        itc_OPR->func.text_get = _gl_develop_options_title_get;
        itc_OPR->func.content_get = _gl_AOD_OPR_check_get;
        itc_OPR->func.del = _info_gl_del;
 
-       Elm_Genlist_Item_Class *itc= elm_genlist_item_class_new();
+       Elm_Genlist_Item_Class *itc = elm_genlist_item_class_new();
        itc->item_style = "1text";
        itc->func.text_get = _gl_develop_options_title_get;
        itc->func.del = _info_gl_del;
@@ -992,7 +991,7 @@ Evas_Object *_create_developer_option_list(void *data)
        menu_its = developer_options_menu_its;
 
        Elm_Genlist_Item_Class *title_item = elm_genlist_item_class_new();
-       title_item ->func.text_get = _gl_developer_opt_title_text_get;
+       title_item->func.text_get = _gl_developer_opt_title_text_get;
        title_item->item_style = "title";
        title_item->func.del = _info_gl_del;
 
@@ -1004,7 +1003,7 @@ Evas_Object *_create_developer_option_list(void *data)
                Info_Item_Data *id = calloc(sizeof(Info_Item_Data), 1);
                Elm_Genlist_Item_Class *in_itc = NULL;
 
-               if(idx == 0)
+               if (idx == 0)
                        in_itc = itc_OPR;
                else
                        in_itc = itc;
@@ -1046,7 +1045,7 @@ static void _disable_develop_mode_cancel_cb(void *data, Evas_Object *obj, void *
                return;
 
        vconf_get_bool(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, &val);
-       if(val == 0) {
+       if (val == 0) {
                val = 1;
                vconf_set_bool(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, val);
                insert_develop_genlist_item(ad);

diff --git a/src/setting-language.c b/src/setting-language.c
index 3b2dd218e9f3b706bef7585d100a8642c30e232e..028e33ece61a53a44af280a08bcb29e7c583ec92 100644 (file)
--- a/src/setting-language.c
+++ b/src/setting-language.c
@@ -188,8 +188,8 @@ static int _set_dateformat(const char *region)
        int32_t bestPatternCapacity =
                (int32_t)(sizeof(bestPattern) / sizeof((bestPattern)[0]));
        (void)i18n_udatepg_get_best_pattern(pattern_generator, customSkeleton,
-                                                               i18n_ustring_get_length(customSkeleton), bestPattern,
-                                                               bestPatternCapacity, &best_pattern_len);
+                                                                               i18n_ustring_get_length(customSkeleton), bestPattern,
+                                                                               bestPatternCapacity, &best_pattern_len);
 
        ret_str = i18n_ustring_copy_au(bestPatternString, bestPattern);
        DBG("i18n_ustring_copy_au ret_str=%d", ret_str);
@@ -334,7 +334,7 @@ Evas_Object *_gl_lang_ridio_get(void *data, Evas_Object *obj, const char *part)
                }
                FREE(alt_lang_set2);
 
-               DBG("Setting - current language is %s", (lang_set != NULL)? lang_set : "NULL");
+               DBG("Setting - current language is %s", (lang_set != NULL) ? lang_set : "NULL");
 
                index++;
 

diff --git a/src/setting-sound.c b/src/setting-sound.c
index d19a9b197b70f84ce47958b4b4f002312be03ab2..13302f5d07587dd59058a2f60192089aac460008 100644 (file)
--- a/src/setting-sound.c
+++ b/src/setting-sound.c
@@ -246,10 +246,10 @@ static void get_sound_file_list(char *dir, int type)
        }
 
        while (!readdir_r(dp, &entry, &result) && result &&
-                       ringtone_count < (sizeof(ringtone_arr)-1) &&
-                       notification_count < (sizeof(notification_name_arr)-1) &&
-                       notification_count < (sizeof(notification_arr)-1)
-                       ) {
+                  ringtone_count < (sizeof(ringtone_arr)-1) &&
+                  notification_count < (sizeof(notification_name_arr)-1) &&
+                  notification_count < (sizeof(notification_arr)-1)
+                 ) {
                if (strncmp(result->d_name, ".", 1)
                        && strlen(dir) < 1024
                        && strlen(replace(result->d_name, ".ogg", "")) < 1024
@@ -273,7 +273,7 @@ static void get_sound_file_list(char *dir, int type)
                        } else {
                                strncpy(notification_arr[notification_count], dir, sizeof(notification_arr)-1-notification_count);
                                strncat(notification_arr[notification_count], result->d_name,
-                                                 1024 - strlen(notification_arr[notification_count]) );
+                                               1024 - strlen(notification_arr[notification_count]));
 
                                strncpy(notification_name_arr[notification_count], replace(result->d_name, ".ogg", ""), sizeof(notification_name_arr)-1-notification_count);
                                strncpy(notification_name_arr[notification_count], replace(notification_name_arr[notification_count], "_", " "), sizeof(notification_name_arr)-1-notification_count);

diff --git a/src/setting-volume-page.c b/src/setting-volume-page.c
index 618c568a751324d0c13525866cd7ec8fda2dd45d..b80b7d271d0e5f5dd1dc3b72916686627a08dce9 100644 (file)
--- a/src/setting-volume-page.c
+++ b/src/setting-volume-page.c
@@ -365,7 +365,7 @@ _scroll(void *data, Evas_Object *obj, void *ei)
        }
 }
 
-static void _change_btn_img(Evas_Object *page_layout, Evas_Object *btn_obj, char * path, char * btn_str)
+static void _change_btn_img(Evas_Object *page_layout, Evas_Object *btn_obj, char *path, char *btn_str)
 {
        char img_path[PATH_MAX];
        snprintf(img_path, sizeof(img_path), "%s/%s", IMG_DIR, path);
@@ -533,7 +533,7 @@ static void _press_minus_volume_cb(void *data, Evas_Object *obj, void *event_inf
        }
 }
 
-static char*
+static char *
 _accessible_name_cb(void *data, Evas_Object *obj)
 {
        page_data *pd = (page_data *)data;
@@ -544,10 +544,10 @@ _accessible_name_cb(void *data, Evas_Object *obj)
        return strdup(elm_object_part_text_get(pd->page_layout[cur_page], "elm.text.slider"));
 }
 
-static char*
+static char *
 _accessible_name_cb_img_minus(void *data, Evas_Object *obj)
 {
-       char buf[1024] ={0,};
+       char buf[1024] = {0,};
        page_data *pd = (page_data *)data;
        int cur_page = 0;
        elm_scroller_current_page_get(pd->scroller, &cur_page, NULL);
@@ -557,10 +557,10 @@ _accessible_name_cb_img_minus(void *data, Evas_Object *obj)
        return strdup(buf);
 }
 
-static char*
+static char *
 _accessible_name_cb_img_plus(void *data, Evas_Object *obj)
 {
-       char buf[1024] ={0,};
+       char buf[1024] = {0,};
        page_data *pd = (page_data *)data;
        int cur_page = 0;
        elm_scroller_current_page_get(pd->scroller, &cur_page, NULL);
@@ -569,14 +569,14 @@ _accessible_name_cb_img_plus(void *data, Evas_Object *obj)
 
        return strdup(buf);
 }
-static char*
+static char *
 _accessible_name_cb_img_mute_unmute(void *data, Evas_Object *obj)
 {
-       char buf[1024] ={0,};
+       char buf[1024] = {0,};
        page_data *pd = (page_data *)data;
        int cur_page = 0;
        elm_scroller_current_page_get(pd->scroller, &cur_page, NULL);
-       if(pd->slider_value[cur_page] == 0)     {
+       if (pd->slider_value[cur_page] == 0)    {
                snprintf(buf, sizeof(buf)-1, "Mute Button");
        } else {
                snprintf(buf, sizeof(buf)-1, "Unmute Button");
@@ -587,7 +587,7 @@ _accessible_name_cb_img_mute_unmute(void *data, Evas_Object *obj)
 
 
 
-static char*
+static char *
 _accessible_volume_name_cb(void *data, Evas_Object *obj)
 {
        page_data *pd = (page_data *)data;
@@ -597,10 +597,10 @@ _accessible_volume_name_cb(void *data, Evas_Object *obj)
        return strdup(_(img_string[cur_page]));
 }
 
-static char*
+static char *
 _accessible_slider_description_cb(void *data, Evas_Object *obj)
 {
-       char buf[1024] ={0,};
+       char buf[1024] = {0,};
        page_data *pd = (page_data *)data;
        int cur_page = 0;
        elm_scroller_current_page_get(pd->scroller, &cur_page, NULL);
@@ -612,11 +612,11 @@ _accessible_slider_description_cb(void *data, Evas_Object *obj)
 
 
 static void
-_img_accessible_register(Evas_Object *layout, Evas_Object *img, void* data, int text_num)
+_img_accessible_register(Evas_Object *layout, Evas_Object *img, void *data, int text_num)
 {
        Evas_Object *ao_btn;
        ao_btn = elm_access_object_register(img, layout);
-       switch(text_num) {
+       switch (text_num) {
        case 1:
                elm_atspi_accessible_name_cb_set(ao_btn, _accessible_name_cb_img_minus, data);
                break;
@@ -733,8 +733,8 @@ Evas_Object *_create_volume_page(void *data)
                ao = elm_access_object_register(to, page_layout);
                elm_atspi_accessible_name_cb_set(ao, _accessible_name_cb, pd);
                elm_atspi_accessible_reading_info_type_set(ao, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
-               elm_atspi_accessible_name_cb_set(slider,_accessible_volume_name_cb, pd);
-               elm_atspi_accessible_description_cb_set(slider,_accessible_slider_description_cb, pd);
+               elm_atspi_accessible_name_cb_set(slider, _accessible_volume_name_cb, pd);
+               elm_atspi_accessible_description_cb_set(slider, _accessible_slider_description_cb, pd);
 
                Evas_Object *btn_minus;
                btn_minus = elm_image_add(page_layout);
@@ -786,7 +786,7 @@ Evas_Object *_create_volume_page(void *data)
                Evas_Object *to_bottom_text = (Evas_Object *)edje_object_part_object_get((const Edje_Object *)elm_layout_edje_get(page_layout), "elm.text.bottom");
                Evas_Object *ao_bottom_text = elm_access_object_register(to_bottom_text, page_layout);
                elm_atspi_accessible_reading_info_type_set(ao_bottom_text, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
-               elm_atspi_accessible_name_cb_set(ao_bottom_text,_accessible_volume_name_cb, pd);
+               elm_atspi_accessible_name_cb_set(ao_bottom_text, _accessible_volume_name_cb, pd);
 
                pd->center_img[i] = img;
 
@@ -887,7 +887,7 @@ static void _play_sound_all_type(int sound_type, float volume)
                int ret_vconf = vconf_set_int(VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT, temp_volume_index);
                vconf_set_int("db/setting/sound/call/rmd_ringtone_volume", temp_volume_index);  /* backup ringtone volume */
 
-               //_set_volumn(sound_type, volume_index, VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT);
+               /*_set_volumn(sound_type, volume_index, VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT); */
 
                ERR("vconf_name SET INT : %s = %d, ret %d", VCONFKEY_SETAPPL_CALL_RINGTONE_SOUND_VOLUME_INT, temp_volume_index, ret_vconf);
 

diff --git a/src/setting.c b/src/setting.c
index 0f245778936fd80e06b127b66ba315cf5a804e3a..9f8fe84cdeb48b1a6e8ebbfcf02a9516dc708985 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -45,7 +45,7 @@
 int app_control_set_package(app_control_h app_control, const char *package);
 
 static struct _main_menu_item setting_menu_its[] = {
-       { SETTING_MAIN_MENU_DISPLAY,                    "IDS_ST_MBODY_DISPLAY_ABB",             "b_setting_list_display.png",           display_cb                      },
+       { SETTING_MAIN_MENU_DISPLAY,                    "IDS_ST_MBODY_DISPLAY_ABB",             "b_setting_list_display.png",           display_cb                      },
        { SETTING_MAIN_MENU_SOUND,                              "IDS_ST_OPT_SOUND_ABB2",                "b_setting_list_sound.png",                     sound_cb                        },
        { SETTING_MAIN_MENU_DEVICE,                             "IDS_ST_BODY_DEVICE",                   "b_settings_list_device.png",                   device_cb                       },
        { SETTING_MAIN_MENU_CONNECTIONS,                "IDS_ST_BODY_CONNECTIONS",              "b_setting_list_connections.png",               connection_cb   },
@@ -441,57 +441,57 @@ void profile_cb(void *data, Evas_Object *obj, void *event_info)
 
 void account_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
-
-       DBG("account_cb in");
-       appdata *ad = data;
-
-       if (ad == NULL) {
-               DBG("Setting - ad is null");
-               return;
-       }
-
-       app_control_h service;
-       app_control_create(&service);
-       app_control_set_package(service, "org.tizen.my-account");
-       app_control_add_extra_data(service, "launch-type", "setting");
-       app_control_send_launch_request(service, NULL, NULL);
-       app_control_destroy(service);
-
-       running = true;
-
-       if (running_timer) {
-               ecore_timer_del(running_timer);
-               running_timer = NULL;
-       }
-       running_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_app_ctrl_timer_cb, NULL);
+       elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+
+       DBG("account_cb in");
+       appdata *ad = data;
+
+       if (ad == NULL) {
+               DBG("Setting - ad is null");
+               return;
+       }
+
+       app_control_h service;
+       app_control_create(&service);
+       app_control_set_package(service, "org.tizen.my-account");
+       app_control_add_extra_data(service, "launch-type", "setting");
+       app_control_send_launch_request(service, NULL, NULL);
+       app_control_destroy(service);
+
+       running = true;
+
+       if (running_timer) {
+               ecore_timer_del(running_timer);
+               running_timer = NULL;
+       }
+       running_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_app_ctrl_timer_cb, NULL);
 }
 
 void accessiblity_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+       elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
-       DBG("accessiblity_cb in");
-       appdata *ad = data;
+       DBG("accessiblity_cb in");
+       appdata *ad = data;
 
-       if (ad == NULL) {
-               DBG("Setting - ad is null");
-               return;
-       }
+       if (ad == NULL) {
+               DBG("Setting - ad is null");
+               return;
+       }
 
-       app_control_h service;
-       app_control_create(&service);
-       app_control_set_package(service, "org.tizen.accessibility-setting");
-       app_control_send_launch_request(service, NULL, NULL);
-       app_control_destroy(service);
+       app_control_h service;
+       app_control_create(&service);
+       app_control_set_package(service, "org.tizen.accessibility-setting");
+       app_control_send_launch_request(service, NULL, NULL);
+       app_control_destroy(service);
 
-       running = true;
+       running = true;
 
-       if (running_timer) {
-               ecore_timer_del(running_timer);
-               running_timer = NULL;
-       }
-       running_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_app_ctrl_timer_cb, NULL);
+       if (running_timer) {
+               ecore_timer_del(running_timer);
+               running_timer = NULL;
+       }
+       running_timer = ecore_timer_add(0.5, (Ecore_Task_Cb)_app_ctrl_timer_cb, NULL);
 }
 
 
@@ -802,7 +802,7 @@ static Evas_Object *_create_mainlist_winset(Evas_Object *parent, appdata *ad)
                if (menu_its[idx].menu_num == SETTING_MAIN_MENU_DEVELOPER_OPTIONS) {
                        int val = 0;
                        vconf_get_bool(VCONFKEY_SETAPPL_DEVELOPER_OPTION_STATE, &val);
-                       if(val == 0)
+                       if (val == 0)
                                continue;
 
                }
@@ -856,14 +856,14 @@ void insert_develop_genlist_item(void *data)
 
        id->index = SETTING_MAIN_MENU_DEVELOPER_OPTIONS;
        g_develop_opt_item = elm_genlist_item_insert_before(
-                                                  ad->main_genlist,                    /* genlist object */
-                                                  itc,                         /* item class */
-                                                  id,                                  /* data */
-                                                  NULL,
-                                                  g_gear_info_item,
-                                                  ELM_GENLIST_ITEM_NONE,
-                                                  setting_menu_its[SETTING_MAIN_MENU_DEVELOPER_OPTIONS].func,
-                                                  ad);
+                                                        ad->main_genlist,                      /* genlist object */
+                                                        itc,                           /* item class */
+                                                        id,                                    /* data */
+                                                        NULL,
+                                                        g_gear_info_item,
+                                                        ELM_GENLIST_ITEM_NONE,
+                                                        setting_menu_its[SETTING_MAIN_MENU_DEVELOPER_OPTIONS].func,
+                                                        ad);
 
        elm_genlist_item_class_free(itc);
        elm_genlist_realized_items_update(ad->main_genlist);
@@ -876,7 +876,7 @@ void delete_develop_genlist_item(void *data)
        setting_ret_if(!ad);
        setting_ret_if(!ad->main_genlist);
 
-       if(g_develop_opt_item != NULL) {
+       if (g_develop_opt_item != NULL) {
                elm_object_item_del(g_develop_opt_item);
                g_develop_opt_item = NULL;
        }
@@ -1143,11 +1143,11 @@ void clear_popup_naviframe(appdata *ad)
        Elm_Object_Item *bottom = elm_naviframe_bottom_item_get(ad->nf);
 
        if (ad->popup) {
-                  evas_object_del(ad->popup);
-                  ad->popup = NULL;
+               evas_object_del(ad->popup);
+               ad->popup = NULL;
        }
 
-       if(ad->main_navi)
+       if (ad->main_navi)
                elm_naviframe_item_pop_to(bottom);
 
        __DISTROY_FREE_SERVICE(ad->service_wifi);
@@ -1168,7 +1168,7 @@ int check_direct_momentbar_setting(void *data, app_control_h service)
        setting_retvm_if(!data, 0, "NO App data!!");
 
        if (app_control_get_extra_data(service, "launch-type", &param) == APP_CONTROL_ERROR_NONE) {
-               if(!ad->is_first_launch) {
+               if (!ad->is_first_launch) {
                        clear_popup_naviframe(ad);
                        clear_back_button_list();
                        back_button_cb_push(&_exit_app, NULL, NULL, NULL, "EXIT!! NO genlist");
@@ -1178,7 +1178,7 @@ int check_direct_momentbar_setting(void *data, app_control_h service)
 
                if (param && !strcmp(param, "brightness")) {
                        load_brightness_setting(data);
-               } else if(param && !strcmp(param, "volume")) {
+               } else if (param && !strcmp(param, "volume")) {
                        load_volume_setting(data);
                }
                if (ad->win_main) {
@@ -1188,7 +1188,7 @@ int check_direct_momentbar_setting(void *data, app_control_h service)
                DBG("Setting - enable direct brightness or volume setting");
                return 1;
        } else {
-               if(ad->is_first_launch)
+               if (ad->is_first_launch)
                        _create_view_layout(ad);
                DBG("Setting - disable direct brightness or volume setting - CanNOT read the launch-type param");
        }
@@ -1206,14 +1206,14 @@ void app_reset(app_control_h service, void *data)
        char *operation = NULL;
        app_control_get_operation(service, &operation);
 
-       if(check_direct_momentbar_setting(data, service))
+       if (check_direct_momentbar_setting(data, service))
                return;
 
        DBG("operation : %s, ad->is_first_launch :%d ", operation, (ad) ? ad->is_first_launch : -1);
        if (!ad->is_first_launch) {
                if (operation && (!strcmp(operation, "http://tizen.org/appcontrol/operation/default")
-                                               || !strcmp(operation, "http://tizen.org/appcontrol/operation/main"))
-               ) {
+                                                 || !strcmp(operation, "http://tizen.org/appcontrol/operation/main"))
+                  ) {
                        clear_popup_naviframe(ad);
 
                        /*reset back button callback stack*/

diff --git a/src/util.c b/src/util.c
index 8cc70e670e7a8017681be904a9b941bd0f65c226..8a8dce6538cc39b888650bb34665fee9ba091676 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -260,7 +260,7 @@ void _hw_back_key_cb(void *data, Evas_Object *obj, void *event_info)
        return;
 }
 
-static char*
+static char *
 _accessible_title_name_cb(void *data, Evas_Object *obj)
 {
        char buf[255];
@@ -270,7 +270,7 @@ _accessible_title_name_cb(void *data, Evas_Object *obj)
        return strdup(buf);
 }
 
-static char*
+static char *
 _accessible_body_name_cb(void *data, Evas_Object *obj)
 {
        Evas_Object *layout = data;