2007-11-28 Alp Toker <alp@atoker.com>

        Reviewed by Timothy Hatcher.

        http://bugs.webkit.org/show_bug.cgi?id=16174
        [GTK] Use "URI" not "URL" in public API

        Replace use of the term "URL" with "URI" in public headers,
        documentation and some internal code to match GLib/GTK+ convention.

        This is now mentioned in the API guidelines:
          http://trac.webkit.org/projects/webkit/wiki/HackingGtk

        API/ABI-breaking change.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/Api/webkitgtkframe.cpp b/WebKit/gtk/Api/webkitgtkframe.cpp
index f67072c4a7af9fc7957392f66d86f9ad1cc7adc0..3d3f1046cc86c322eaeebf8f4ad481ebbac5f8d2 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkframe.cpp
+++ b/WebKit/gtk/Api/webkitgtkframe.cpp
@@ -286,7 +286,7 @@ WebKitFrame* webkit_frame_get_parent(WebKitFrame* frame)
  * @frame: a #WebKitFrame
  * @request: a #WebKitNetworkRequest
  *
- * Connects to a given URL by initiating an asynchronous client request.
+ * Connects to a given URI by initiating an asynchronous client request.
  *
  * Creates a provisional data source that will transition to a committed data
  * source once any data has been received. Use webkit_frame_stop_loading() to
@@ -301,7 +301,7 @@ void webkit_frame_load_request(WebKitFrame* frame, WebKitNetworkRequest* request
     g_return_if_fail(coreFrame);
 
     // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it gets implemented.
-    DeprecatedString string = DeprecatedString::fromUtf8(webkit_network_request_get_url(request));
+    DeprecatedString string = DeprecatedString::fromUtf8(webkit_network_request_get_uri(request));
     coreFrame->loader()->load(ResourceRequest(KURL(string)));
 }
 

diff --git a/WebKit/gtk/Api/webkitgtknetworkrequest.cpp b/WebKit/gtk/Api/webkitgtknetworkrequest.cpp
index 69b882275e0ea28e3159372f3b358bea8704c46e..921725f798f4186642ace7a93dc93c5adc67796b 100644 (file)
--- a/WebKit/gtk/Api/webkitgtknetworkrequest.cpp
+++ b/WebKit/gtk/Api/webkitgtknetworkrequest.cpp
@@ -42,7 +42,7 @@ static void webkit_network_request_finalize(GObject* object)
 {
     WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(object);
 
-    g_free(requestPrivate->url);
+    g_free(requestPrivate->uri);
 
     G_OBJECT_CLASS(webkit_network_request_parent_class)->finalize(object);
 }
@@ -58,17 +58,17 @@ static void webkit_network_request_init(WebKitNetworkRequest* request)
 {
 }
 
-WebKitNetworkRequest* webkit_network_request_new(const gchar* url)
+WebKitNetworkRequest* webkit_network_request_new(const gchar* uri)
 {
     WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, NULL));
     WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
 
-    requestPrivate->url = g_strdup(url);
+    requestPrivate->uri = g_strdup(uri);
 
     return request;
 }
 
-void webkit_network_request_set_url(WebKitNetworkRequest* request, const gchar* url)
+void webkit_network_request_set_uri(WebKitNetworkRequest* request, const gchar* uri)
 {
     WebKitNetworkRequestPrivate* requestPrivate;
 
@@ -76,11 +76,11 @@ void webkit_network_request_set_url(WebKitNetworkRequest* request, const gchar*
 
     requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
 
-    g_free(requestPrivate->url);
-    requestPrivate->url = g_strdup(url);
+    g_free(requestPrivate->uri);
+    requestPrivate->uri = g_strdup(uri);
 }
 
-const gchar* webkit_network_request_get_url(WebKitNetworkRequest* request)
+const gchar* webkit_network_request_get_uri(WebKitNetworkRequest* request)
 {
     WebKitNetworkRequestPrivate* requestPrivate;
 
@@ -88,7 +88,7 @@ const gchar* webkit_network_request_get_url(WebKitNetworkRequest* request)
 
     requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
 
-    return requestPrivate->url;
+    return requestPrivate->uri;
 }
 
 }

diff --git a/WebKit/gtk/Api/webkitgtknetworkrequest.h b/WebKit/gtk/Api/webkitgtknetworkrequest.h
index 6fe2982961122c80af76d9f60c4b201aef5be935..638540cb12771f94f30cba7bf13f4e272d09d83a 100644 (file)
--- a/WebKit/gtk/Api/webkitgtknetworkrequest.h
+++ b/WebKit/gtk/Api/webkitgtknetworkrequest.h
@@ -55,13 +55,13 @@ WEBKIT_API GType
 webkit_network_request_get_type (void);
 
 WEBKIT_API WebKitNetworkRequest*
-webkit_network_request_new (const gchar* url);
+webkit_network_request_new (const gchar* uri);
 
 WEBKIT_API void
-webkit_network_request_set_url (WebKitNetworkRequest* request, const gchar* url);
+webkit_network_request_set_uri (WebKitNetworkRequest* request, const gchar* uri);
 
 WEBKIT_API const gchar*
-webkit_network_request_get_url (WebKitNetworkRequest* request);
+webkit_network_request_get_uri (WebKitNetworkRequest* request);
 
 G_END_DECLS
 

diff --git a/WebKit/gtk/Api/webkitgtkpage.cpp b/WebKit/gtk/Api/webkitgtkpage.cpp
index 6685282cff02fa2714507c25d1b0eba053a2286f..6b6f9c44d1b7e0d3fcd47ce28a445fbacc73cf62 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkpage.cpp
+++ b/WebKit/gtk/Api/webkitgtkpage.cpp
@@ -724,14 +724,14 @@ gboolean webkit_page_can_go_forward(WebKitPage* page)
     return frameData->frame->loader()->canGoBackOrForward(1);
 }
 
-void webkit_page_open(WebKitPage* page, const gchar* url)
+void webkit_page_open(WebKitPage* page, const gchar* uri)
 {
     g_return_if_fail(WEBKIT_IS_PAGE(page));
 
     WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
     WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
 
-    DeprecatedString string = DeprecatedString::fromUtf8(url);
+    DeprecatedString string = DeprecatedString::fromUtf8(uri);
     frameData->frame->loader()->load(ResourceRequest(KURL(string)));
 }
 
@@ -744,14 +744,14 @@ void webkit_page_reload(WebKitPage* page)
     frameData->frame->loader()->reload();
 }
 
-void webkit_page_load_string(WebKitPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUrl)
+void webkit_page_load_string(WebKitPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUri)
 {
     g_return_if_fail(WEBKIT_IS_PAGE(page));
 
     WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
     WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
 
-    KURL url(DeprecatedString::fromUtf8(baseUrl));
+    KURL url(DeprecatedString::fromUtf8(baseUri));
     RefPtr<SharedBuffer> sharedBuffer = new SharedBuffer(strdup(content), strlen(content));
     SubstituteData substituteData(sharedBuffer.release(), String(contentMimeType), String(contentEncoding), KURL("about:blank"), url);
 

diff --git a/WebKit/gtk/Api/webkitgtkpage.h b/WebKit/gtk/Api/webkitgtkpage.h
index f6669ddad5978301253baaa066b8b803ddb36d05..590343790b267f5d29df6b403cc1a8121464b076 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkpage.h
+++ b/WebKit/gtk/Api/webkitgtkpage.h
@@ -107,16 +107,16 @@ WEBKIT_API void
 webkit_page_stop_loading (WebKitPage* page);
 
 WEBKIT_API void
-webkit_page_open (WebKitPage* page, const gchar* url);
+webkit_page_open (WebKitPage* page, const gchar* uri);
 
 WEBKIT_API void
 webkit_page_reload (WebKitPage *page);
 
 WEBKIT_API void
-webkit_page_load_string (WebKitPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_url);
+webkit_page_load_string (WebKitPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_uri);
 
 WEBKIT_API void
-webkit_page_load_html_string (WebKitPage* page, const gchar* content, const gchar* base_url);
+webkit_page_load_html_string (WebKitPage* page, const gchar* content, const gchar* base_uri);
 
 WEBKIT_API WebKitFrame*
 webkit_page_get_main_frame (WebKitPage* page);

diff --git a/WebKit/gtk/Api/webkitgtkprivate.h b/WebKit/gtk/Api/webkitgtkprivate.h
index 0bafca80c655e4f4dfbf2ea901e1b701418cf9bb..d470209a72bcaf90c45e3cccd2d38fd6b46cca2c 100644 (file)
--- a/WebKit/gtk/Api/webkitgtkprivate.h
+++ b/WebKit/gtk/Api/webkitgtkprivate.h
@@ -87,7 +87,7 @@ extern "C" {
     #define WEBKIT_NETWORK_REQUEST_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate))
     typedef struct _WebKitNetworkRequestPrivate WebKitNetworkRequestPrivate;
     struct _WebKitNetworkRequestPrivate {
-        gchar* url;
+        gchar* uri;
     };
 
     WebKitFrame* webkit_frame_init_with_page(WebKitPage*, WebCore::HTMLFrameOwnerElement*);

diff --git a/WebKit/gtk/Api/webkitgtksettings.h b/WebKit/gtk/Api/webkitgtksettings.h
index 2c672d7498a4700e91eb2bc62dd5b37b9582ec1b..a555cff0fa6d24bd1d7f9fa6d4a1fd079060a4b5 100644 (file)
--- a/WebKit/gtk/Api/webkitgtksettings.h
+++ b/WebKit/gtk/Api/webkitgtksettings.h
@@ -74,7 +74,7 @@ struct _WebKitSettings {
     WebKitEditableLinkBehaviour editable_link_behaviour;
     gboolean uses_page_cache;
     gboolean shrink_standalone_images_to_fit;
-    gboolean show_urls_in_tool_tips;
+    gboolean show_uris_in_tool_tips;
     gchar* ftp_directory_template_path;
     gboolean force_ftp_directory_listings;
     gboolean developer_extras_enabled;

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d0534007b03310240ce189fbc971791355a35a1e..4e6a35d53d333a845ca0ba8468f07352e41bf0c9 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,26 @@
+2007-11-28  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Timothy Hatcher.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16174
+        [GTK] Use "URI" not "URL" in public API
+
+        Replace use of the term "URL" with "URI" in public headers,
+        documentation and some internal code to match GLib/GTK+ convention.
+
+        This is now mentioned in the API guidelines:
+          http://trac.webkit.org/projects/webkit/wiki/HackingGtk
+
+        API/ABI-breaking change.
+
+        * Api/webkitgtkframe.cpp:
+        * Api/webkitgtknetworkrequest.cpp:
+        * Api/webkitgtknetworkrequest.h:
+        * Api/webkitgtkpage.cpp:
+        * Api/webkitgtkpage.h:
+        * Api/webkitgtkprivate.h:
+        * Api/webkitgtksettings.h:
+
 2007-11-29  Brady Eidson  <beidson@apple.com>
 
         Better build fix for Gtk

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0dc128db31de88b94c38ef2bdcdce145cc961d2c..950f3f269a4608f850fb833979858d081bd29c2f 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2007-11-28  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Timothy Hatcher.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16174
+        [GTK] Use "URI" not "URL" in public API
+
+        Replace use of the term "URL" with "URI" in public headers,
+        documentation and some internal code to match GLib/GTK+ convention.
+
+        This is now mentioned in the API guidelines:
+          http://trac.webkit.org/projects/webkit/wiki/HackingGtk
+
+        * GtkLauncher/main.c:
+        (activate_uri_entry_cb):
+        (title_change_cb):
+        (create_toolbar):
+        (main):
+
 2007-11-29  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam.

diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c
index cd502a901dc04d93e0e3971b8391f6444d5a0a92..93e39f93c5f01ab193cef563eb4b362a33417fe0 100644 (file)
--- a/WebKitTools/GtkLauncher/main.c
+++ b/WebKitTools/GtkLauncher/main.c
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 
 static GtkWidget* main_window;
-static GtkWidget* url_entry;
+static GtkWidget* uri_entry;
 static GtkStatusbar* main_statusbar;
 static WebKitPage* web_page;
 static gchar* main_title;
@@ -37,11 +37,11 @@ static gint load_progress;
 static guint status_context_id;
 
 static void
-activate_url_entry_cb (GtkWidget* entry, gpointer data)
+activate_uri_entry_cb (GtkWidget* entry, gpointer data)
 {
-    const gchar* url = gtk_entry_get_text (GTK_ENTRY (entry));
-    g_assert (url);
-    webkit_page_open (web_page, url);
+    const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry));
+    g_assert (uri);
+    webkit_page_open (web_page, uri);
 }
 
 static void
@@ -66,9 +66,9 @@ link_hover_cb (WebKitPage* page, const gchar* title, const gchar* link, gpointer
 }
 
 static void
-title_change_cb (WebKitPage* page, const gchar* title, const gchar* url, gpointer data)
+title_change_cb (WebKitPage* page, const gchar* title, const gchar* uri, gpointer data)
 {
-    gtk_entry_set_text (GTK_ENTRY (url_entry), url);
+    gtk_entry_set_text (GTK_ENTRY (uri_entry), uri);
 
     if (main_title)
         g_free (main_title);
@@ -149,14 +149,14 @@ create_toolbar ()
     /* The URL entry */
     item = gtk_tool_item_new ();
     gtk_tool_item_set_expand (item, TRUE);
-    url_entry = gtk_entry_new ();
-    gtk_container_add (GTK_CONTAINER (item), url_entry);
-    g_signal_connect (G_OBJECT (url_entry), "activate", G_CALLBACK (activate_url_entry_cb), NULL);
+    uri_entry = gtk_entry_new ();
+    gtk_container_add (GTK_CONTAINER (item), uri_entry);
+    g_signal_connect (G_OBJECT (uri_entry), "activate", G_CALLBACK (activate_uri_entry_cb), NULL);
     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
     /* The go button */
     item = gtk_tool_button_new_from_stock (GTK_STOCK_OK);
-    g_signal_connect_swapped (G_OBJECT (item), "clicked", G_CALLBACK (activate_url_entry_cb), (gpointer)url_entry);
+    g_signal_connect_swapped (G_OBJECT (item), "clicked", G_CALLBACK (activate_uri_entry_cb), (gpointer)uri_entry);
     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
     return toolbar;
@@ -187,8 +187,8 @@ main (int argc, char* argv[])
     main_window = create_window ();
     gtk_container_add (GTK_CONTAINER (main_window), vbox);
 
-    gchar* url = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/");
-    webkit_page_open (web_page, url);
+    gchar* uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/");
+    webkit_page_open (web_page, uri);
 
     gtk_widget_grab_focus (GTK_WIDGET (web_page));
     gtk_widget_show_all (main_window);