diff options
| -rw-r--r-- | services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp | 18 | ||||
| -rw-r--r-- | services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp index 6b90a91e..81e001d8 100644 --- a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp +++ b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp @@ -257,11 +257,11 @@ void AutoFillFormComposeView::addItems() elm_entry_prediction_allow_set(m_postCodeItemCallbackData.entry, EINA_FALSE); // country region - m_countyRegionItemCallbackData.type = profile_composer_title_country_region; - createInputLayout(m_box, strdup(_("IDS_BR_MBODY_COUNTRY_REGION")), &m_countyRegionItemCallbackData); - elm_box_pack_end(m_box, m_countyRegionItemCallbackData.it); + m_countryRegionItemCallbackData.type = profile_composer_title_country_region; + createInputLayout(m_box, strdup(_("IDS_BR_MBODY_COUNTRY_REGION")), &m_countryRegionItemCallbackData); + elm_box_pack_end(m_box, m_countryRegionItemCallbackData.it); if (m_itemForCompose->getStateProvince() && strlen(m_itemForCompose->getStateProvince())) - elm_object_part_text_set(m_countyRegionItemCallbackData.entry, "elm.text", m_itemForCompose->getStateProvince()); + elm_object_part_text_set(m_countryRegionItemCallbackData.entry, "elm.text", m_itemForCompose->getStateProvince()); // phone m_phoneItemCallbackData.type = profile_composer_title_phone; @@ -352,12 +352,12 @@ Eina_Bool AutoFillFormComposeView::applyEntryData(void) m_itemForCompose->setSecondaryAddress2(secondary_address); const char *city_town = elm_entry_entry_get(m_cityTownItemCallbackData.entry); m_itemForCompose->setCityTown(city_town); - const char *county = elm_entry_entry_get(m_countryItemCallbackData.entry); - m_itemForCompose->setStateProvince(county); + const char *country = elm_entry_entry_get(m_countryItemCallbackData.entry); + m_itemForCompose->setCountry(country); const char *post_code = elm_entry_entry_get(m_postCodeItemCallbackData.entry); m_itemForCompose->setPostCode(post_code); - const char *country = elm_entry_entry_get(m_countyRegionItemCallbackData.entry); - m_itemForCompose->setCountry(country); + const char *region = elm_entry_entry_get(m_countryRegionItemCallbackData.entry); + m_itemForCompose->setStateProvince(region); const char *phone = elm_entry_entry_get(m_phoneItemCallbackData.entry); m_itemForCompose->setPhoneNumber(phone); const char *email = elm_entry_entry_get(m_emailItemCallbackData.entry); @@ -486,7 +486,7 @@ void AutoFillFormComposeView::__entry_next_key_cb(void* data, Evas_Object* /*obj } else if (type == profile_composer_title_country) { entry = self->m_postCodeItemCallbackData.entry; } else if (type == profile_composer_title_post_code) { - entry = self->m_countyRegionItemCallbackData.entry; + entry = self->m_countryRegionItemCallbackData.entry; } else if (type == profile_composer_title_country_region) { entry = self->m_phoneItemCallbackData.entry; } else if (type == profile_composer_title_phone) { diff --git a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h index 4c4a756b..d47f1ace 100644 --- a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h +++ b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h @@ -93,7 +93,7 @@ private: genlistCallbackData m_cityTownItemCallbackData; genlistCallbackData m_countryItemCallbackData; genlistCallbackData m_postCodeItemCallbackData; - genlistCallbackData m_countyRegionItemCallbackData; + genlistCallbackData m_countryRegionItemCallbackData; genlistCallbackData m_phoneItemCallbackData; genlistCallbackData m_emailItemCallbackData; std::string m_edjFilePath; |