Only talk about URIs

Let's stick to WebKit's and GNOME's terminology.

diff --git a/README b/README
index 22ead08284e0600166c3b94ac4a879cd5bfd543b..00c3b7284701334bcc24f7ed46bd9c2a33096d1f 100644 (file)
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ A simple web browser using GTK+ 2, GLib and WebKitGTK+.
 Features:
 
     - A WebKit viewport
-    - An input box to change the URL or to search the current page
+    - An input box to change the URI or to search the current page
     - Built-in launching of suckless' tabbed
     - Built-in adblock
     - Built-in download manager
@@ -96,7 +96,7 @@ Main windows
             Close the current window.
 
         Mod1 + w
-            Go to your "homepage" which is the first URL specified on
+            Go to your "homepage" which is the first URI specified on
             the command line.
 
         Mod1 + e
@@ -157,11 +157,11 @@ Main windows
             Reset the content of the location bar to "/".
 
         Escape
-            Reset the content of the location bar to the current URL.
+            Reset the content of the location bar to the current URI.
 
         Return
             "Commit", i.e. begin searching, do a keyword based search or
-            open the URL.
+            open the URI.
 
 
 Download manager
@@ -195,7 +195,7 @@ following options:
     -T
         Disables automatic launching of suckless' tabbed.
 
-After these options there can be any number of URLs. If no URLs are
+After these options there can be any number of URIs. If no URIs are
 given, about:blank will be opened.
 
 
@@ -248,7 +248,7 @@ Lines starting with "#" are ignored.
 Keyword based searching
 =======================
 
-In this file, you can configure keywords and the associated URLs:
+In this file, you can configure keywords and the associated URIs:
 
     ~/.config/lariza/keywordsearch
 
@@ -257,7 +257,7 @@ Each line has to look like this:
     wi https://en.wikipedia.org/w/index.php?title=Special:Search&search=%s
 
 "wi" is the keyword, so when opening "wi foo", lariza will search in
-Wikipedia. Note the "%s" at the end of the URL: This is where your
+Wikipedia. Note the "%s" at the end of the URI: This is where your
 search term will be placed.
 
 Lines starting with "#" are ignored.

diff --git a/browser.c b/browser.c
index 14b02bc7ca5d2849a5f5bd812c9be8c5a0ae47cd..938f9418fc3f42d38269cd8de023bcdd51b41983 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -32,7 +32,7 @@ static gboolean download_request(WebKitWebView *, WebKitWebFrame *,
                                  WebKitWebPolicyDecision *, gpointer);
 static void downloadmanager_cancel(GtkToolButton *, gpointer data);
 static void downloadmanager_setup(void);
-static gchar *ensure_url_scheme(const gchar *);
+static gchar *ensure_uri_scheme(const gchar *);
 static void grab_environment_configuration(void);
 static void hover_web_view(WebKitWebView *, gchar *, gchar *, gpointer);
 static gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer);
@@ -294,7 +294,7 @@ client_new(const gchar *uri)
 
        if (uri != NULL)
        {
-               f = ensure_url_scheme(uri);
+               f = ensure_uri_scheme(uri);
                if (show_all_requests)
                        fprintf(stderr, "====> %s\n", uri);
                webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
@@ -530,7 +530,7 @@ downloadmanager_setup(void)
 }
 
 gchar *
-ensure_url_scheme(const gchar *t)
+ensure_uri_scheme(const gchar *t)
 {
        gchar *f;
 
@@ -649,7 +649,7 @@ key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
                                        }
                                        else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t))
                                        {
-                                               f = ensure_url_scheme(t);
+                                               f = ensure_uri_scheme(t);
                                                if (show_all_requests)
                                                        fprintf(stderr, "====> %s\n", f);
                                                webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
@@ -688,14 +688,14 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
                                        gtk_widget_destroy(c->win);
                                        return TRUE;
                                case GDK_KEY_w:  /* home (left hand) */
-                                       f = ensure_url_scheme(first_uri);
+                                       f = ensure_uri_scheme(first_uri);
                                        if (show_all_requests)
                                                fprintf(stderr, "====> %s\n", f);
                                        webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
                                        g_free(f);
                                        return TRUE;
                                case GDK_KEY_e:  /* new tab (left hand) */
-                                       f = ensure_url_scheme(first_uri);
+                                       f = ensure_uri_scheme(first_uri);
                                        if (show_all_requests)
                                                fprintf(stderr, "====> %s\n", f);
                                        client_new(f);