web/web2 : Deprecated uri. url will be used instead.

ewebkit used uri and url as mixed for a long time.
But last year, ewebkit2 decide to use url for the consistency.

Below is discussion and webkit-efl bug about "uri vs url"
https://lists.webkit.org/pipermail/webkit-efl/2012-October/000312.html
https://bugs.webkit.org/show_bug.cgi?id=98643

diff --git a/src/bin/test_web.c b/src/bin/test_web.c
index b3bfcfb..fcf297c 100644 (file)
--- a/src/bin/test_web.c
+++ b/src/bin/test_web.c
@@ -40,12 +40,12 @@ _btn_reload_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSE
 }
 
 static void
-_url_change_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+_url_entry_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Evas_Object *web = data;
-   const char *uri = elm_object_text_get(obj);
+   const char *url = elm_object_text_get(obj);
 
-   elm_web_uri_set(web, uri);
+   elm_web_url_set(web, url);
 }
 
 static void
@@ -63,7 +63,7 @@ _title_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 }
 
 static void
-_uri_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
+_url_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Web_Test *wt = data;
 
@@ -403,7 +403,7 @@ test_web(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    elm_box_pack_end(bx2, url);
    evas_object_show(url);
 
-   evas_object_smart_callback_add(url, "activated", _url_change_cb, web);
+   evas_object_smart_callback_add(url, "activated", _url_entry_changed_cb, web);
    wt->url_entry = url;
 
    bx2 = elm_box_add(win);
@@ -472,13 +472,13 @@ test_web(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
    evas_object_smart_callback_add(bt, "clicked", _bring_in_region_cb, wt);
 
    evas_object_smart_callback_add(web, "title,changed", _title_changed_cb, win);
-   evas_object_smart_callback_add(web, "uri,changed", _uri_changed_cb, wt);
+   evas_object_smart_callback_add(web, "url,changed", _url_changed_cb, wt);
 
    evas_object_event_callback_add(web, EVAS_CALLBACK_DEL, _main_web_del_cb, wt);
 
    wt->web = web;
 
-   elm_web_uri_set(web, "http://www.enlightenment.org");
+   elm_web_url_set(web, "http://www.enlightenment.org");
 
    elm_web_window_create_hook_set(web, _new_window_hook, wt);
 

diff --git a/src/examples/web_example_01.c b/src/examples/web_example_01.c
index 74ea132..116095c 100644 (file)
--- a/src/examples/web_example_01.c
+++ b/src/examples/web_example_01.c
@@ -34,7 +34,7 @@ elm_main(int argc, char *argv[])
    elm_win_resize_object_add(win, web);
    elm_web_history_enabled_set(web, EINA_FALSE);
 
-   if (!elm_web_uri_set(web, URL))
+   if (!elm_web_url_set(web, URL))
      {
         printf("URL NOT LOADED");
         return -1;

diff --git a/src/examples/web_example_02.c b/src/examples/web_example_02.c
index 44a3e04..f9f3f40 100644 (file)
--- a/src/examples/web_example_02.c
+++ b/src/examples/web_example_02.c
@@ -15,7 +15,7 @@ typedef struct
    Evas_Object *win;
    Evas_Object *main_box;
    Evas_Object *naviframe;
-   Evas_Object *url;
+   Evas_Object *url_entry;
    Evas_Object *default_web;
    Evas_Object *tabs;
    Evas_Object *close_tab;
@@ -57,18 +57,18 @@ nav_button_update(App_Data *ad)
 static void
 tab_current_set(Tab_Data *td)
 {
-   const char *uri;
+   const char *url;
 
    if (td == td->app->current_tab)
      return;
 
    td->app->current_tab = td;
 
-   uri = elm_web_uri_get(td->web);
-   elm_object_text_set(td->app->url, uri);
+   url = elm_web_url_get(td->web);
+   elm_object_text_set(td->app->url_entry, url);
 
    nav_button_update(td->app);
-   elm_entry_icon_visible_set(td->app->url, EINA_TRUE);
+   elm_entry_icon_visible_set(td->app->url_entry, EINA_TRUE);
 
    elm_naviframe_item_simple_promote(td->app->naviframe, td->web);
 }
@@ -97,16 +97,16 @@ _title_changed_cb(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
+_url_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
    Tab_Data *td = data;
-   const char *uri = event_info;
+   const char *url = event_info;
 
    if (td != td->app->current_tab)
      return;
 
    nav_button_update(td->app);
-   elm_object_text_set(td->app->url, uri);
+   elm_object_text_set(td->app->url_entry, url);
 }
 
 static void
@@ -127,7 +127,7 @@ _tb_item_del_cb(void *data, Evas_Object *obj, void *event_info)
    if (!td->app->exiting && !elm_toolbar_selected_item_get(obj))
      {
         td->app->current_tab = NULL;
-        elm_entry_icon_visible_set(td->app->url, EINA_FALSE);
+        elm_entry_icon_visible_set(td->app->url_entry, EINA_FALSE);
         if (td->app->search_box)
           evas_object_del(td->app->search_box);
      }
@@ -159,7 +159,7 @@ tab_add(App_Data *ad)
 
    evas_object_smart_callback_add(td->web, "title,changed", _title_changed_cb,
                                   td);
-   evas_object_smart_callback_add(td->web, "uri,changed", _uri_changed_cb, td);
+   evas_object_smart_callback_add(td->web, "url,changed", _url_changed_cb, td);
    evas_object_event_callback_add(td->web, EVAS_CALLBACK_FREE, _web_free_cb,
                                   td);
 
@@ -168,61 +168,61 @@ tab_add(App_Data *ad)
 }
 
 static char *
-uri_sanitize(const char *uri)
+url_sanitize(const char *url)
 {
-   char *fixed_uri;
+   char *fixed_url;
    char *schema;
    char *tmp;
 
-   if (!uri || !*uri) return NULL;
+   if (!url || !*url) return NULL;
 
-   tmp = strstr(uri, "://");
-   if (!tmp || (tmp == uri) || (tmp > (uri + 15)))
+   tmp = strstr(url, "://");
+   if (!tmp || (tmp == url) || (tmp > (url + 15)))
      {
-        char *new_uri = NULL;
-        if (ecore_file_exists(uri))
+        char *new_url = NULL;
+        if (ecore_file_exists(url))
           {
              schema = "file";
-             new_uri = ecore_file_realpath(uri);
+             new_url = ecore_file_realpath(url);
           }
         else
           schema = "http";
 
-        if (asprintf(&fixed_uri, "%s://%s", schema, new_uri ? new_uri : uri) >
+        if (asprintf(&fixed_url, "%s://%s", schema, new_url ? new_url : url) >
             0)
           {
-             free(new_uri);
-             return fixed_uri;
+             free(new_url);
+             return fixed_url;
           }
-        free(new_uri);
+        free(new_url);
      }
    else
-     return strdup(uri);
+     return strdup(url);
 
    return NULL;
 }
 
 static void
-tab_uri_set(Tab_Data *td, const char *uri)
+tab_url_set(Tab_Data *td, const char *url)
 {
-   char *sane_uri = uri_sanitize(uri);
-   elm_web_uri_set(td->web, sane_uri);
-   free(sane_uri);
+   char *sane_url = url_sanitize(url);
+   elm_web_url_set(td->web, sane_url);
+   free(sane_url);
 }
 
 static void
-_url_activated_cb(void *data, Evas_Object *obj, void *event_info)
+_url_entry_activated_cb(void *data, Evas_Object *obj, void *event_info)
 {
    App_Data *ad = data;
    Tab_Data *td;
-   const char *uri = eina_stringshare_ref(elm_object_text_get(obj));
+   const char *url = eina_stringshare_ref(elm_object_text_get(obj));
 
    if (!ad->current_tab)
      td = tab_add(ad);
    else
      td = ad->current_tab;
-   tab_uri_set(td, uri);
-   eina_stringshare_del(uri);
+   tab_url_set(td, url);
+   eina_stringshare_del(url);
 }
 
 static void
@@ -268,7 +268,7 @@ _add_tab_cb(void *data, Evas_Object *obj, void *event_info)
 {
    App_Data *ad = data;
    tab_add(ad);
-   elm_object_focus_set(ad->url, EINA_TRUE);
+   elm_object_focus_set(ad->url_entry, EINA_TRUE);
 }
 
 static Evas_Object *
@@ -373,7 +373,7 @@ _win_search_trigger_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
    elm_box_horizontal_set(box, EINA_TRUE);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_box_pack_after(ad->main_box, box, ad->url);
+   elm_box_pack_after(ad->main_box, box, ad->url_entry);
    evas_object_show(box);
 
    evas_object_event_callback_add(box, EVAS_CALLBACK_DEL, _search_box_del_cb,
@@ -462,7 +462,7 @@ default_content_set(Evas_Object *web)
 EAPI_MAIN int
 elm_main(int argc, char *argv[])
 {
-   Evas_Object *win, *bg, *box, *box2, *btn, *ic, *url, *naviframe, *tabs, *web;
+   Evas_Object *win, *bg, *box, *box2, *btn, *ic, *url_entry, *naviframe, *tabs, *web;
    Evas *e;
    Evas_Modifier_Mask ctrl_mask;
    App_Data *ad;
@@ -499,20 +499,20 @@ elm_main(int argc, char *argv[])
    elm_win_resize_object_add(win, box);
    evas_object_show(box);
 
-   url = elm_entry_add(win);
-   elm_entry_single_line_set(url, EINA_TRUE);
-   elm_entry_scrollable_set(url, EINA_TRUE);
-   evas_object_size_hint_weight_set(url, EVAS_HINT_EXPAND, 0.0);
-   evas_object_size_hint_align_set(url, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_box_pack_end(box, url);
-   evas_object_show(url);
+   url_bar = elm_entry_add(win);
+   elm_entry_single_line_set(url_bar, EINA_TRUE);
+   elm_entry_scrollable_set(url_bar, EINA_TRUE);
+   evas_object_size_hint_weight_set(url_bar, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(url_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(box, url_bar);
+   evas_object_show(url_bar);
 
-   evas_object_smart_callback_add(url, "activated", _url_activated_cb, ad);
+   evas_object_smart_callback_add(url_bar, "activated", _url_bar_activated_cb, ad);
 
    box2 = elm_box_add(win);
    elm_box_horizontal_set(box2, EINA_TRUE);
-   elm_object_part_content_set(url, "icon", box2);
-   elm_entry_icon_visible_set(url, EINA_FALSE);
+   elm_object_part_content_set(url_bar, "icon", box2);
+   elm_entry_icon_visible_set(url_bar, EINA_FALSE);
 
    btn = elm_button_add(win);
    elm_box_pack_end(box2, btn);
@@ -607,7 +607,7 @@ elm_main(int argc, char *argv[])
    ad->win = win;
    ad->main_box = box;
    ad->naviframe = naviframe;
-   ad->url = url;
+   ad->url_bar = url_bar;
    ad->default_web = web;
    ad->tabs = tabs;
    ad->close_tab = btn;

diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index e5076a8..070f6e8 100644 (file)
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -71,6 +71,7 @@ static const Evas_Smart_Cb_Description _elm_web_smart_callbacks[] = {
    { "toolbars,visible,set", "b" },
    { "tooltip,text,set", "s" },
    { "uri,changed", "s" },
+   { "url,changed", "s" },
    { "view,resized", "" },
    { "windows,close,request", ""},
    { "zoom,animated,end", "" },
@@ -1025,6 +1026,9 @@ _view_smart_callback_proxy_cb(void *data,
 {
    Elm_Web_Callback_Proxy_Context *ctxt = data;
 
+   if (!strcmp(ctxt->name, "uri,changed"))
+     evas_object_smart_callback_call(ctxt->obj, "url,changed";, event_info);
+
    evas_object_smart_callback_call(ctxt->obj, ctxt->name, event_info);
 }
 
@@ -1497,18 +1501,28 @@ _tab_propagate_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 
 EAPI Eina_Bool
 elm_web_uri_set(Evas_Object *obj,
-                const char *uri)
+                const char *url)
+{
+   ELM_WEB_CHECK(obj) EINA_FALSE;
+   Eina_Bool ret = EINA_FALSE;
+   eo_do(obj, elm_obj_web_url_set(url, &ret));
+   return ret;
+}
+
+EAPI Eina_Bool
+elm_web_url_set(Evas_Object *obj,
+                const char *url)
 {
    ELM_WEB_CHECK(obj) EINA_FALSE;
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, elm_obj_web_uri_set(uri, &ret));
+   eo_do(obj, elm_obj_web_url_set(url, &ret));
    return ret;
 }
 
 static void
-_uri_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+_url_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
-   const char *uri = va_arg(*list, const char *);
+   const char *url = va_arg(*list, const char *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
 
@@ -1516,10 +1530,10 @@ _uri_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    Eina_Bool int_ret = EINA_FALSE;
    Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
 
-   int_ret = ewk_view_uri_set(wd->resize_obj, uri);
+   int_ret = ewk_view_uri_set(wd->resize_obj, url);
    if (ret) *ret = int_ret;
 #else
-   (void)uri;
+   (void)url;
    *ret = EINA_FALSE;
    (void)obj;
 #endif
@@ -1530,12 +1544,21 @@ elm_web_uri_get(const Evas_Object *obj)
 {
    ELM_WEB_CHECK(obj) NULL;
    const char *ret = NULL;
-   eo_do((Eo *) obj, elm_obj_web_uri_get(&ret));
+   eo_do((Eo *) obj, elm_obj_web_url_get(&ret));
+   return ret;
+}
+
+EAPI const char *
+elm_web_url_get(const Evas_Object *obj)
+{
+   ELM_WEB_CHECK(obj) NULL;
+   const char *ret = NULL;
+   eo_do((Eo *) obj, elm_obj_web_url_get(&ret));
    return ret;
 }
 
 static void
-_uri_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+_url_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    const char **ret = va_arg(*list, const char **);
 #ifdef HAVE_ELEMENTARY_WEB
@@ -2634,8 +2657,8 @@ _class_constructor(Eo_Class *klass)
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET), _useragent_get),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET), _tab_propagate_get),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET), _tab_propagate_set),
-        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URI_SET), _uri_set),
-        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URI_GET), _uri_get),
+        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_SET), _url_set),
+        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_GET), _url_get),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TITLE_GET), _title_get),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET), _bg_color_set),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET), _bg_color_get),
@@ -2685,8 +2708,8 @@ static const Eo_Op_Description op_desc[] = {
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET, "Return current useragent of elm_web object."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET, "Gets the status of the tab propagation."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET, "Sets whether to use tab propagation."),
-     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URI_SET, "Sets the URI for the web object."),
-     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URI_GET, "Gets the current URI for the object."),
+     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URL_SET, "Sets the URL for the web object."),
+     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URL_GET, "Gets the current URL for the object."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TITLE_GET, "Gets the current title."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET, "Sets the background color to be used by the web object."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET, "Gets the background color to be used by the web object."),

diff --git a/src/lib/elm_web.h b/src/lib/elm_web.h
index bdad362..ba3f906 100644 (file)
--- a/src/lib/elm_web.h
+++ b/src/lib/elm_web.h
@@ -68,7 +68,8 @@
  * info is an Eina_Bool with the visibility state
  * @li "tooltip,text,set": Show and set text of a tooltip. Event info is
  * a string with the text to show
- * @li "uri,changed": URI of the main frame changed. Event info is a string
+ * @li "uri,changed": URI of the main frame changed. Event info is a string (deprecated. use "url,changed" instead)
+ * @li "url,changed": URL of the main frame changed. Event info is a string
  * with the new URI
  * @li "view,resized": The web object internal's view changed sized
  * @li "windows,close,request": A JavaScript request to close the current

diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 7b661c5..5c349f0 100644 (file)
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -19,8 +19,12 @@ EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
 static Ewk_View_Smart_Class _ewk_view_parent_sc =
   EWK_VIEW_SMART_CLASS_INIT_NULL;
 
+static const char SIG_URI_CHANGED[] = "uri,changed"; // deprecated, use "url,changed" instead.
+static const char SIG_URL_CHANGED[] = "url,changed";
+
 static const Evas_Smart_Cb_Description _elm_web_smart_callbacks[] = {
-   { "url,changed", "s" },
+   { SIG_URI_CHANGED, "s" },
+   { SIG_URL_CHANGED, "s" },
    { "focused", ""}, /**< handled by elm_widget */
    { "unfocused", ""}, /**< handled by elm_widget */
    { NULL, NULL }
@@ -92,6 +96,21 @@ _view_add(Evas_Object *parent)
    return view;
 }
 
+static void
+_view_smart_url_changed_cb(void *data,
+                           Evas_Object *obj __UNUSED__,
+                           void *event_info)
+{
+   evas_object_smart_callback_call(data, SIG_URI_CHANGED, event_info);
+   evas_object_smart_callback_call(data, SIG_URL_CHANGED, event_info);
+}
+
+static void
+_view_smart_callback_proxy(Evas_Object *view, Evas_Object *parent)
+{
+   evas_object_smart_callback_add(view, SIG_URL_CHANGED, _view_smart_url_changed_cb, parent);
+}
+
 static Eina_Bool _elm_need_web = EINA_FALSE;
 
 void
@@ -115,10 +134,14 @@ static void
 _elm_web_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 {
 #ifdef HAVE_ELEMENTARY_WEB
-   elm_widget_resize_object_set(obj, _view_add(obj));
+   Evas_Object *resize_obj;
+
+   resize_obj = _view_add(obj);
+   elm_widget_resize_object_set(obj, resize_obj);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
 
+   _view_smart_callback_proxy(resize_obj, obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 #endif
 }
@@ -375,24 +398,34 @@ _useragent_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 
 EAPI Eina_Bool
 elm_web_uri_set(Evas_Object *obj,
-                const char *uri)
+                const char *url)
+{
+   ELM_WEB_CHECK(obj) EINA_FALSE;
+   Eina_Bool ret = EINA_FALSE;
+   eo_do(obj, elm_obj_web_url_set(url, &ret));
+   return ret;
+}
+
+EAPI Eina_Bool
+elm_web_url_set(Evas_Object *obj,
+                const char *url)
 {
    ELM_WEB_CHECK(obj) EINA_FALSE;
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, elm_obj_web_uri_set(uri, &ret));
+   eo_do(obj, elm_obj_web_url_set(url, &ret));
    return ret;
 }
 
 static void
-_uri_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+_url_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
 
-   const char *uri = va_arg(*list, const char *);
+   const char *url = va_arg(*list, const char *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
    if (ret) *ret = EINA_FALSE;
    Eina_Bool int_ret = EINA_FALSE;
-   int_ret = ewk_view_url_set(wd->resize_obj, uri);
+   int_ret = ewk_view_url_set(wd->resize_obj, url);
    if (ret) *ret = int_ret;
 }
 
@@ -401,12 +434,21 @@ elm_web_uri_get(const Evas_Object *obj)
 {
    ELM_WEB_CHECK(obj) NULL;
    const char *ret = NULL;
-   eo_do((Eo *) obj, elm_obj_web_uri_get(&ret));
+   eo_do((Eo *) obj, elm_obj_web_url_get(&ret));
+   return ret;
+}
+
+EAPI const char *
+elm_web_url_get(const Evas_Object *obj)
+{
+   ELM_WEB_CHECK(obj) NULL;
+   const char *ret = NULL;
+   eo_do((Eo *) obj, elm_obj_web_url_get(&ret));
    return ret;
 }
 
 static void
-_uri_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+_url_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 {
    const char **ret = va_arg(*list, const char **);
    Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
@@ -1279,8 +1321,8 @@ _class_constructor(Eo_Class *klass)
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_SET), _useragent_set),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET), _useragent_get),
 
-        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URI_SET), _uri_set),
-        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URI_GET), _uri_get),
+        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_SET), _url_set),
+        EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_GET), _url_get),
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TITLE_GET), _title_get),
 
         EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET), _bg_color_set),
@@ -1331,8 +1373,8 @@ static const Eo_Op_Description op_desc[] = {
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET, "Return current useragent of elm_web object."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET, "Gets the status of the tab propagation."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET, "Sets whether to use tab propagation."),
-     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URI_SET, "Sets the URI for the web object."),
-     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URI_GET, "Gets the current URI for the object."),
+     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URL_SET, "Sets the URL for the web object."),
+     EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URL_GET, "Gets the current URL for the object."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TITLE_GET, "Gets the current title."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET, "Sets the background color to be used by the web object."),
      EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET, "Gets the background color to be used by the web object."),

diff --git a/src/lib/elm_web_eo.h b/src/lib/elm_web_eo.h
index 01de93e..28678b0 100644 (file)
--- a/src/lib/elm_web_eo.h
+++ b/src/lib/elm_web_eo.h
@@ -17,8 +17,8 @@ enum
    ELM_OBJ_WEB_SUB_ID_USERAGENT_GET,
    ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET,
    ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET,
-   ELM_OBJ_WEB_SUB_ID_URI_SET,
-   ELM_OBJ_WEB_SUB_ID_URI_GET,
+   ELM_OBJ_WEB_SUB_ID_URL_SET,
+   ELM_OBJ_WEB_SUB_ID_URL_GET,
    ELM_OBJ_WEB_SUB_ID_TITLE_GET,
    ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET,
    ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET,
@@ -217,33 +217,33 @@ enum
 #define elm_obj_web_tab_propagate_set(propagate) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET), EO_TYPECHECK(Eina_Bool, propagate)
 
 /**
- * @def elm_obj_web_uri_set
+ * @def elm_obj_web_url_set
  * @since 1.8
  *
- * Sets the URI for the web object
+ * Sets the URL for the web object
  *
- * @param[in] uri
+ * @param[in] url
  * @param[out] ret
  *
- * @see elm_web_uri_set
+ * @see elm_web_url_set
  *
  * @ingroup Web
  */
-#define elm_obj_web_uri_set(uri, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URI_SET), EO_TYPECHECK(const char *, uri), EO_TYPECHECK(Eina_Bool *, ret)
+#define elm_obj_web_url_set(url, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_SET), EO_TYPECHECK(const char *, url), EO_TYPECHECK(Eina_Bool *, ret)
 
 /**
- * @def elm_obj_web_uri_get
+ * @def elm_obj_web_url_get
  * @since 1.8
  *
- * Gets the current URI for the object
+ * Gets the current URL for the object
  *
  * @param[out] ret
  *
- * @see elm_web_uri_get
+ * @see elm_web_url_get
  *
  * @ingroup Web
  */
-#define elm_obj_web_uri_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URI_GET), EO_TYPECHECK(const char **, ret)
+#define elm_obj_web_url_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_GET), EO_TYPECHECK(const char **, ret)
 
 /**
  * @def elm_obj_web_title_get