fixed About phone - numbers
authorMyoungJune Park <mj2004.park@samsung.com>
Mon, 15 Oct 2012 10:07:10 +0000 (19:07 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Mon, 15 Oct 2012 10:07:17 +0000 (19:07 +0900)
setting-about/src/setting-about-main.c
setting-about/src/setting-about.c

index f3fc968..c5d3ba6 100755 (executable)
@@ -661,8 +661,20 @@ int setting_about_generate_genlist(void *data)
                        SETTING_TRACE_ERROR("ad->data_wap is NULL");
                }
 
-       } else {
+       } else if (ad->my_numbers.count == 0) {
+               // _("IDS_ST_HEADER_UNAVAILABLE")
                SETTING_TRACE_ERROR("don't have my number");
+               item_data =
+                       setting_create_Gendial_field_def(scroller, &(ad->itc_2text_2),
+                                       NULL,
+                                       ad, SWALLOW_Type_INVALID, NULL,
+                                       NULL, 0, SETTING_ABOUT_MY_NUMBER_STR,
+                                       _("IDS_ST_HEADER_UNAVAILABLE"), NULL);
+               if (item_data) {
+                       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+               } else {
+                       SETTING_TRACE_ERROR("item_data is NULL");
+               }
        }
 
        // [UI] Phone model
index b2daa92..d6df739 100755 (executable)
@@ -255,6 +255,9 @@ static void __about_gl_sel_expand(void *data, Evas_Object *obj,
        elm_genlist_item_expanded_set(item, status);
 }
 
+/**
+ * @see __on_sim_get_msisdn (caller)
+ */
 Eina_Bool __insert_item_idler(void *data)
 {
        SETTING_TRACE_BEGIN;
@@ -304,6 +307,10 @@ Eina_Bool __insert_item_idler(void *data)
        return FALSE;
 }
 
+/**
+ * called at initialization of About UG
+ * @see tel_get_sim_msisnd
+ */
 static void __on_sim_get_msisdn(TapiHandle *handle, int result, void *data, void *user_data)
 {
        SETTING_TRACE_BEGIN;
@@ -336,7 +343,7 @@ static void __on_sim_get_msisdn(TapiHandle *handle, int result, void *data, void
        setting_get_string_slp_key(STR_SLP_SETTING_SELECT_NUM, sel_num, &err);
 
        bool isFound = FALSE;
-       //SETTING_TRACE("ad->my_numbers.count[%d]", ad->my_numbers.count);
+       SETTING_TRACE("ad->my_numbers.count[%d]", ad->my_numbers.count);
 
        for (i = 0; i < ad->my_numbers.count && i < SETTING_ABOUT_MY_NUMBERS_LEN; i++) {
                SETTING_TRACE("index[%d] - name[%s], num[%s]", i, ad->my_numbers.list[i].name, ad->my_numbers.list[i].num);
@@ -354,8 +361,7 @@ static void __on_sim_get_msisdn(TapiHandle *handle, int result, void *data, void
                evas_object_del(ad->popup);
                ad->popup = NULL;
        }
-       //setting_about_generate_genlist((void *)ad);
-       ecore_idler_add(__insert_item_idler, ad);
+       setting_about_generate_genlist((void *)ad);
 }
 
 UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
@@ -375,12 +381,16 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
        ops->priv = aboutUG;
        ops->opt = UG_OPT_INDICATOR_ENABLE;
 
+       // init aboutUG
+
        int err = 0;
        int value;
        setting_get_int_slp_key(INT_SLP_SETTING_SIM_SLOT, &value, &err);
        if (VCONFKEY_TELEPHONY_SIM_INSERTED == value)//There is a sim card, so do display to user
        {
                aboutUG->handle = tel_init(NULL);
+
+
                SETTING_TRACE("aboutUG->handle:%p", aboutUG->handle);
                if (aboutUG->handle) {
                        SETTING_TRACE("tel_init sucessed, and there is at least one sim card, now trying to get misidns");
@@ -515,7 +525,8 @@ void setting_about_main_exp_cb(void *data, Evas_Object *obj, void *event_info)
        int i = 0;
        int sel_idx = -1;
        Setting_GenGroupItem_Data *item_data = NULL;
-       for(; i < SETTING_ABOUT_MY_NUMBERS_LEN; i++) {
+
+       for(; i < ad->my_numbers.count; i++) {
                if (ad->my_numbers.list[i].num == NULL) {
                        break;
                }