GNOME.org
 

[epiphany] WebKitGTK+ -> WebKitGTK

commit 41c88d5d67fed071a5aae8b58960830bdc6e4454
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Feb 20 16:08:11 2019 -0600

    WebKitGTK+ -> WebKitGTK

 CONTRIBUTING.md                     |  8 ++++----
 HACKING.md                          | 14 +++++++-------
 data/epiphany.1                     |  2 +-
 data/org.gnome.epiphany.gschema.xml |  2 +-
 embed/ephy-about-handler.c          |  2 +-
 src/window-commands.c               |  2 +-
 tests/ephy-history-test.c           |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0d13153ed..92102fdcd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,10 +8,10 @@ For tips for hacking on Epiphany, see the HACKING.md file.
 Please include the following in your issue report:
 
  * Epiphany version
- * WebKitGTK+ version
+ * WebKitGTK version
  * Operating system and version
 
-Check the About dialog if you're not sure what Epiphany or WebKitGTK+ versions
+Check the About dialog if you're not sure what Epiphany or WebKitGTK versions
 you have.
 
 # Web Content Bugs
@@ -22,11 +22,11 @@ issues, web inspector issues, or generally anything at all wrong with a
 website). These problems should all be reported directly on
 [WebKit Bugzilla](https://bugs.webkit.org) instead. The Epiphany developers are
 also WebKit developers, and we will see your WebKit bug reports so long as you
-are careful to select the WebKitGTK+ Bugzilla component when reporting the
+are careful to select the WebKitGTK Bugzilla component when reporting the
 issue. Don't forget! Please also add the `[GTK]` prefix to the title of your
 bug.
 
-In general, only problems with the GTK+ user interface around the web content
+In general, only problems with the GTK user interface around the web content
 view (e.g. menus, preferences dialog, window chrome, history, bookmarks, tabs)
 or Epiphany features (e.g. Firefox Sync, adblocker, password manager, web apps)
 should be reported on Epiphany's GitLab issue tracker.
diff --git a/HACKING.md b/HACKING.md
index 2e287bcae..7a04f6e0c 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -99,14 +99,14 @@ or more tabs, and each tab is an `EphyEmbed`. That's worth repeating: an
 `EphyWebView` (subclass of `WebKitWebView`). This is the object that actually
 displays the web page, where all the web browser magic happens.
 
-## Important WebKitGTK+ Objects
+## Important WebKitGTK Objects
 
-WebKitGTK+ is a WebKit port that provides a GTK+ API wrapper around WebKit.
+WebKitGTK is a WebKit port that provides a GTK API wrapper around WebKit.
 
 WebKit is really nice. It encapsulates 95% of the complexity of building a web
 browser, like the JavaScript engine, HTML layout engine, and actually rendering
 the webpage. Epiphany only has to deal with the remaining 5%. The most important
-WebKitGTK+ objects are:
+WebKitGTK objects are:
 
  * `WebKitWebView` (superclass of `EphyWebView`). Displays the web.
  * `WebKitWebContext`, a global object that manages shared state among web views.
@@ -118,9 +118,9 @@ expects a `WebKitWebContext`. Do not use WebKit's default `WebKitWebContext`;
 that is, do not pass `NULL` to any `WebKitWebContext *` parameter, and do not
 use `webkit_web_context_get_default()`.
 
-There is separate documentation for the [main WebKitGTK+ 
API](https://webkitgtk.org/reference/webkit2gtk/unstable/index.html),
-for the [WebKitGTK+ DOM API](https://webkitgtk.org/reference/webkitdomgtk/unstable/index.html),
-and for the [WebKitGTK+ JavaScriptCore API](https://webkitgtk.org/reference/jsc-glib/unstable/index.html).
+There is separate documentation for the [main WebKitGTK 
API](https://webkitgtk.org/reference/webkit2gtk/unstable/index.html),
+for the [WebKitGTK DOM API](https://webkitgtk.org/reference/webkitdomgtk/unstable/index.html),
+and for the [WebKitGTK JavaScriptCore API](https://webkitgtk.org/reference/jsc-glib/unstable/index.html).
 
 ## Modern WebKit Process Architecture
 
@@ -132,7 +132,7 @@ several subprocesses:
  * One WebKitNetworkProcess, which handles most network requests
  * One or zero WebKitDatabaseProcesses, which handles IndexedDB
 
-In WebKitGTK+, by default each WebKitWebView shares the same WebKitWebProcess.
+In WebKitGTK, by default each WebKitWebView shares the same WebKitWebProcess.
 This can reduce overall resource usage, but it results in a less-stable browser
 as a crash in one tab will crash all other tabs, and the effects of memory leaks
 are greatly amplified. So Epiphany runs a separate WebKitWebProcess for each
diff --git a/data/epiphany.1 b/data/epiphany.1
index 799c5fe75..3b6800a5c 100644
--- a/data/epiphany.1
+++ b/data/epiphany.1
@@ -11,7 +11,7 @@ epiphany \- a simple, clean, beautiful view of the web
 \fBepiphany\fR is the codename of GNOME Web, the web browser designed for the
 GNOME desktop and elementary OS.  It offers a simple, clean, beautiful view of
 the web featuring first-class GNOME and Pantheon desktop integration, using
-WebKitGTK+ for web rendering.
+WebKitGTK for web rendering.
 .SH OPTIONS
 .TP
 \fB\-\-new\-window\fR
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index cc4a2f381..a9db58e96 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -133,7 +133,7 @@
                <key type="s" name="default-encoding">
                        <default>'iso-8859-1'</default>
                        <summary>Default encoding</summary>
-                       <description>Default encoding. Accepted values are the ones WebKitGTK+ can 
understand.</description>
+                       <description>Default encoding. Accepted values are the ones WebKitGTK can 
understand.</description>
                </key>
                <key type="as" name="language">
                        <default>['system']</default>
diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index 970f2af2c..693f8b1ec 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -192,7 +192,7 @@ ephy_about_handler_handle_about (EphyAboutHandler       *handler,
 #endif
                           version,
                           _("A simple, clean, beautiful view of the web"),
-                          "WebKitGTK+", webkit_get_major_version (), webkit_get_minor_version (), 
webkit_get_micro_version ());
+                          "WebKitGTK", webkit_get_major_version (), webkit_get_minor_version (), 
webkit_get_micro_version ());
   g_free (version);
   if (icon_info)
     g_object_unref (icon_info);
diff --git a/src/window-commands.c b/src/window-commands.c
index 7ae990063..ef981835b 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -587,7 +587,7 @@ window_cmd_show_about (GSimpleAction *action,
   g_key_file_free (key_file);
 
   comments = g_strdup_printf (_("A simple, clean, beautiful view of the web.\n"
-                                "Powered by WebKitGTK+ %d.%d.%d"),
+                                "Powered by WebKitGTK %d.%d.%d"),
                               webkit_get_major_version (),
                               webkit_get_minor_version (),
                               webkit_get_micro_version ());
diff --git a/tests/ephy-history-test.c b/tests/ephy-history-test.c
index f9758e6dd..b42ebd023 100644
--- a/tests/ephy-history-test.c
+++ b/tests/ephy-history-test.c
@@ -416,7 +416,7 @@ perform_complex_url_query_with_time_range (EphyHistoryService *service,
 
   /* The expected result. */
   url = ephy_history_url_new ("http://www.webkitgtk.org";,
-                              "WebKitGTK+",
+                              "WebKitGTK",
                               2, 2, 0);
 
   ephy_history_service_query_urls (service, query, NULL, verify_complex_url_query, url);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]