diff options
| author | InBum Chang <ibchang@samsung.com> | 2012-09-10 11:34:24 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@localhost> | 2012-09-10 11:34:24 +0900 |
| commit | 4867db2396a00e895d163c25bcc6b28eb7c045da (patch) | |
| tree | 1a61e0b6c88153bae9ab21c1f3b18cf7f9262deb | |
| parent | 5a4af3d8ce7b47259d8dcf7e8a3147364b8323d0 (diff) | |
| parent | 72bc4ab73711ba7372fe06ee942b485a4d2c51f6 (diff) | |
| download | org.tizen.browser-4867db2396a00e895d163c25bcc6b28eb7c045da.tar.gz org.tizen.browser-4867db2396a00e895d163c25bcc6b28eb7c045da.tar.bz2 org.tizen.browser-4867db2396a00e895d163c25bcc6b28eb7c045da.zip | |
Merge "[Title] set passed origin data even though there is a duplicated website setting in the list." into 2.0_beta
| -rwxr-xr-x | src/browser-settings/browser-settings-website-setting.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/browser-settings/browser-settings-website-setting.cpp b/src/browser-settings/browser-settings-website-setting.cpp index 69bc273..dd419de 100755 --- a/src/browser-settings/browser-settings-website-setting.cpp +++ b/src/browser-settings/browser-settings-website-setting.cpp @@ -739,6 +739,7 @@ void Browser_Settings_Website_Setting::__application_cache_origin_get_cb(Eina_Li && !strcmp(website_setting->m_website_setting_list[i]->url.c_str(), ewk_security_origin_host_get(origin))) { duplicated = EINA_TRUE; website_setting->m_website_setting_list[i]->storage = EINA_TRUE; + website_setting->m_website_setting_list[i]->origin = origin; elm_genlist_item_update((Elm_Object_Item *)(website_setting->m_website_setting_list[i]->user_data)); break; @@ -798,6 +799,7 @@ void Browser_Settings_Website_Setting::__web_storage_origin_get_cb(Eina_List* or && !strcmp(website_setting->m_website_setting_list[i]->url.c_str(), ewk_security_origin_host_get(origin))) { duplicated = EINA_TRUE; website_setting->m_website_setting_list[i]->storage = EINA_TRUE; + website_setting->m_website_setting_list[i]->origin = origin; elm_genlist_item_update((Elm_Object_Item *)(website_setting->m_website_setting_list[i]->user_data)); break; @@ -857,6 +859,7 @@ void Browser_Settings_Website_Setting::__web_database_origin_get_cb(Eina_List* o && !strcmp(website_setting->m_website_setting_list[i]->url.c_str(), ewk_security_origin_host_get(origin))) { duplicated = EINA_TRUE; website_setting->m_website_setting_list[i]->storage = EINA_TRUE; + website_setting->m_website_setting_list[i]->origin = origin; elm_genlist_item_update((Elm_Object_Item *)(website_setting->m_website_setting_list[i]->user_data)); break; |