From 1af4430e6a01135eb0a7e2f8ab69608f996e756d Mon Sep 17 00:00:00 2001
From: Ryuan Choi <ryuan.choi@gmail.com>
Date: Thu, 13 Jun 2013 13:56:16 +0900
Subject: [PATCH] web/web2 : Deprecated uri. url will be used instead(2).

Sorry, I missed elm_web_legacy.h from previous commit.
In addition, updated ChangeLog and NEWS.
---
 legacy/elementary/ChangeLog                |  5 +++
 legacy/elementary/NEWS                     |  2 ++
 legacy/elementary/src/lib/elm_web_legacy.h | 40 ++++++++++++++++++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 16dd118fcd..d45bdac231 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1420,3 +1420,8 @@
         * Keep the smart members of the naviframe views whenever resize object is changed.
 		  This prevents the dangling view objects of the naviframe and keep the layer
 		  consistency.
+
+2013-06-13  Ryuan Choi (ryuan)
+
+        * Replace uri to url from elm_web_uri_get, elm_web_uri_set and "uri,changed" signal.
+        Previous APIs and signal are deprecated.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index c32ec332dc..ae9471887b 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -74,6 +74,7 @@ Additions:
    * Add elm_config_glayer_long_tap_start_timeout_set/get, elm_config_glayer_double_tap_timeout_set/get
    * Add magnifier to entry.
    * Add "focused" and "unfocused" smart callback for panel, video, web, web2, genlist, hover, index, list, map, photocam, progressbar, radio, scroller, slider, slideshow, spinner, toolbar, win, calendar, check, clock, colorselector, datetime, diskselector, flipselector, gengrid, ctxpopup, fileselector_button, naviframe, player, popup, bubble, button.
+   * Add elm_web_url_set(), elm_web_url_get() and "url,changed" signal for web, web2.
 
 Improvements:
 
@@ -252,6 +253,7 @@ Removals:
      to adapt themselves.
    * Deprecate elm_label_slide_set(), elm_label_slide_get().
    * Deprecate elm_object_domain_translatable_text_part_set(), elm_object_translatable_text_part_get().
+   * Deprecate elm_web_uri_set(), elm_web_uri_get() and "uri,changed" signal for web, web2.
 
 Changes since Elementary 1.0.0:
 -------------------------
diff --git a/legacy/elementary/src/lib/elm_web_legacy.h b/legacy/elementary/src/lib/elm_web_legacy.h
index c0af13203e..2d70a436f7 100644
--- a/legacy/elementary/src/lib/elm_web_legacy.h
+++ b/legacy/elementary/src/lib/elm_web_legacy.h
@@ -165,6 +165,34 @@ EAPI Eina_Bool         elm_web_tab_propagate_get(const Evas_Object *obj);
  */
 EAPI void              elm_web_tab_propagate_set(Evas_Object *obj, Eina_Bool propagate);
 
+/**
+ * Sets the URL for the web object
+ *
+ * It must be a full URL, with resource included, in the form
+ * http://www.enlightenment.org or file:///tmp/something.html
+ *
+ * @param obj The web object
+ * @param url The URL to set
+ * @return @c EINA_TRUE if the URL could be set, @c EINA_FALSE if an error occurred.
+ *
+ * @ingroup Web
+ */
+EAPI Eina_Bool         elm_web_url_set(Evas_Object *obj, const char *url);
+
+/**
+ * Gets the current URL for the object
+ *
+ * The returned string must not be freed and is guaranteed to be
+ * stringshared.
+ *
+ * @param obj The web object
+ * @return A stringshared internal string with the current URL, or @c NULL on
+ * failure
+ *
+ * @ingroup Web
+ */
+EAPI const char       *elm_web_url_get(const Evas_Object *obj);
+
 /**
  * Sets the URI for the web object
  *
@@ -175,9 +203,13 @@ EAPI void              elm_web_tab_propagate_set(Evas_Object *obj, Eina_Bool pro
  * @param uri The URI to set
  * @return @c EINA_TRUE if the URI could be set, @c EINA_FALSE if an error occurred.
  *
+ * @deprecated Use elm_web_url_set() instead
+ *
+ * @see elm_web_url_set()
+ *
  * @ingroup Web
  */
-EAPI Eina_Bool         elm_web_uri_set(Evas_Object *obj, const char *uri);
+EINA_DEPRECATED EAPI Eina_Bool         elm_web_uri_set(Evas_Object *obj, const char *uri);
 
 /**
  * Gets the current URI for the object
@@ -189,9 +221,13 @@ EAPI Eina_Bool         elm_web_uri_set(Evas_Object *obj, const char *uri);
  * @return A stringshared internal string with the current URI, or @c NULL on
  * failure
  *
+ * @deprecated Use elm_web_url_get() instead
+ *
+ * @see elm_web_url_get()
+ *
  * @ingroup Web
  */
-EAPI const char       *elm_web_uri_get(const Evas_Object *obj);
+EINA_DEPRECATED EAPI const char       *elm_web_uri_get(const Evas_Object *obj);
 
 /**
  * Gets the current title