char *value = vconf_keynode_get_str(key);
char *vconf_name = vconf_keynode_get_name(key);
if (!safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NWNAME)) {
- if (NULL == value) {
+ if (isEmptyStr(value)) {
value = "IDS_ST_BODY_NOSERVICE";
}
ad->sel_network = strdup(value);
if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, ad->sel_net)) {
SETTING_TRACE_ERROR("vconf[%s] set failed");
}
-
+
if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, ad->sel_act)) {
SETTING_TRACE_ERROR("vconf[%s] set failed");
}
FREE(pa_net_name);
SETTING_TRACE("Found %d valid networks in total[%d]", valid_cnt, cnt);
- setting_create_popup_without_btn(ad, ad->win_get, NULL, _(keyStr_Searched), NULL, POPUP_INTERVAL, FALSE, FALSE);
+ //valid_cnt = 0; for test..
+ if (valid_cnt > 0){
+ setting_create_popup_without_btn(ad, ad->win_get, NULL, _(keyStr_Searched), NULL, POPUP_INTERVAL, FALSE, FALSE);
+ } else { //there is no invalid plmn nearby
+ setting_create_popup_without_btn(ad, ad->win_get, NULL, _("There is no network nearby"), NULL, POPUP_INTERVAL, FALSE, FALSE);
+ }
} else {
setting_create_popup_without_btn(ad, ad->win_get, NULL, _(keyStr_Failed_Searched), NULL, POPUP_INTERVAL, FALSE, FALSE);
}
ret_if(!user_data || !data);
SettingNetworkUG *ad = user_data;
TelNetworkServing_t *srv_nt = data;
-
+
if (result == TAPI_NETWORK_NO_ERR)
{
ad->sel_act = srv_nt->act;
vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, ad->sel_act);
-
+
FREE(ad->sel_network);
ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
- if (NULL == ad->sel_network) {
+ if (isEmptyStr(ad->sel_network)) {
ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
}
setting_network_update_sel_network(ad);
//if failed, do nothing..
}
SETTING_TRACE_END;
-
+
}
SETTING_TRACE("ad->sel_net:%d", ad->sel_net);
SETTING_TRACE("ad->sel_network:%s", ad->sel_network);
SETTING_TRACE("sel_act = [%s(%d)]", setting_network_get_act_str(ad->sel_act),ad->sel_act);
-
+
if (ad->data_auto_network_item) {
if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == ad->sel_net)
{
char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == ad->sel_net) {
snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
- "%s. %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
-
+ "%s, %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
+
} else {
snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
- "%s. %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
+ "%s, %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
setting_network_get_act_str(ad->sel_act));
}
-
+
SETTING_TRACE("sel_network_desc:%s", sel_network_desc);
-
+
G_FREE(ad->data_sel_net->sub_desc);
ad->data_sel_net->sub_desc = (char *)g_strdup(_(sel_network_desc));
-
+
elm_object_item_data_set(ad->data_sel_net->item, ad->data_sel_net);
elm_genlist_item_update(ad->data_sel_net->item);
}
}
}
-
-void __default_tapi_response_cb(TapiHandle *handle, int result, void *data, void *user_data)
-{
-}
-
-
UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
{
SETTING_TRACE_BEGIN;
if (tapi_handle) {
SETTING_TRACE_DEBUG("tel_init sucessfull");
//1.tel_select_network_automatic
- int tapi_ret = tel_select_network_automatic(tapi_handle, __default_tapi_response_cb, NULL);
+ int tapi_ret = tel_select_network_automatic(tapi_handle, NULL, NULL);
if (tapi_ret != TAPI_API_SUCCESS) {
ret++;
SETTING_TRACE_ERROR("tel_select_network_automatic. tapi_ret=%d", tapi_ret);
//2.tel_set_network_band
tapi_ret = tel_set_network_band(tapi_handle, TAPI_NETWORK_BAND_MODE_ONLY,
TAPI_NETWORK_BAND_TYPE_ANY,
- __default_tapi_response_cb, NULL);
+ NULL, NULL);
if (tapi_ret != TAPI_API_SUCCESS) {
ret++;
SETTING_TRACE_ERROR("tel_set_network_band. tapi_ret=%d", tapi_ret);
}
//Reset connections info..
- ret += excuteCmd("/usr/bin/dbus-send", 1, NET_CON_RESET_DBUS_PARA);
+ // -> need to cowork with CSC
+ //ret += excuteCmd("/usr/bin/dbus-send", 1, NET_CON_RESET_DBUS_PARA);
SETTING_TRACE_END;
return ret;