From ceb9c9764a59dd30273037e62c66067fa19a37bc Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Mon, 25 Nov 2019 21:58:48 +1100 Subject: [PATCH] Rename ClientWebView to Components.WebView per code style --- po/POTFILES.in | 2 +- .../accounts/accounts-editor-edit-pane.vala | 4 +- .../accounts/accounts-signature-web-view.vala | 4 +- .../application/application-controller.vala | 4 +- ...web-view.vala => components-web-view.vala} | 38 +++++++++---------- src/client/composer/composer-web-view.vala | 6 +-- src/client/composer/composer-widget.vala | 8 ++-- .../conversation-email.vala | 4 +- .../conversation-message.vala | 4 +- .../conversation-web-view.vala | 6 +-- src/client/meson.build | 2 +- ...ala => components-web-view-test-case.vala} | 12 +++--- ...est.vala => components-web-view-test.vala} | 10 ++--- .../composer/composer-web-view-test.vala | 2 +- ...t.vala => components-page-state-test.vala} | 16 ++++---- test/js/composer-page-state-test.vala | 2 +- test/js/conversation-page-state-test.vala | 2 +- test/meson.build | 6 +-- test/test-client.vala | 6 +-- ...omponents-web-view-allow-remote-images.js} | 0 ...ent-web-view.js => components-web-view.js} | 2 +- ui/org.gnome.Geary.gresource.xml | 4 +- 22 files changed, 72 insertions(+), 72 deletions(-) rename src/client/components/{client-web-view.vala => components-web-view.vala} (95%) rename test/client/components/{client-web-view-test-case.vala => components-web-view-test-case.vala} (78%) rename test/client/components/{client-web-view-test.vala => components-web-view-test.vala} (79%) rename test/js/{client-page-state-test.vala => components-page-state-test.vala} (73%) rename ui/{client-web-view-allow-remote-images.js => components-web-view-allow-remote-images.js} (100%) rename ui/{client-web-view.js => components-web-view.js} (99%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5900c7be..d31b2287 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -31,7 +31,6 @@ src/client/application/goa-mediator.vala src/client/application/main.vala src/client/application/secret-mediator.vala src/client/client-action.vala -src/client/components/client-web-view.vala src/client/components/components-attachment-pane.vala src/client/components/components-entry-undo.vala src/client/components/components-in-app-notification.vala @@ -39,6 +38,7 @@ src/client/components/components-inspector.vala src/client/components/components-placeholder-pane.vala src/client/components/components-preferences-window.vala src/client/components/components-validator.vala +src/client/components/components-web-view.vala src/client/components/count-badge.vala src/client/components/folder-popover.vala src/client/components/icon-factory.vala diff --git a/src/client/accounts/accounts-editor-edit-pane.vala b/src/client/accounts/accounts-editor-edit-pane.vala index c1df9a95..2722db6e 100644 --- a/src/client/accounts/accounts-editor-edit-pane.vala +++ b/src/client/accounts/accounts-editor-edit-pane.vala @@ -718,7 +718,7 @@ internal class Accounts.RemoveMailboxCommand : Application.Command { internal class Accounts.SignatureChangedCommand : Application.Command { - private ClientWebView signature_view; + private Components.WebView signature_view; private Geary.AccountInformation account; private string old_value; @@ -728,7 +728,7 @@ internal class Accounts.SignatureChangedCommand : Application.Command { private bool new_enabled = false; - public SignatureChangedCommand(ClientWebView signature_view, + public SignatureChangedCommand(Components.WebView signature_view, Geary.AccountInformation account) { this.signature_view = signature_view; this.account = account; diff --git a/src/client/accounts/accounts-signature-web-view.vala b/src/client/accounts/accounts-signature-web-view.vala index ca31ad5e..d424dd64 100644 --- a/src/client/accounts/accounts-signature-web-view.vala +++ b/src/client/accounts/accounts-signature-web-view.vala @@ -8,14 +8,14 @@ /** * A class for editing signatures in the accounts editor. */ -public class Accounts.SignatureWebView : ClientWebView { +public class Accounts.SignatureWebView : Components.WebView { private static WebKit.UserScript? app_script = null; public static new void load_resources() throws GLib.Error { - SignatureWebView.app_script = ClientWebView.load_app_script( + SignatureWebView.app_script = Components.WebView.load_app_script( "signature-web-view.js" ); } diff --git a/src/client/application/application-controller.vala b/src/client/application/application-controller.vala index ec46ed5d..8155804f 100644 --- a/src/client/application/application-controller.vala +++ b/src/client/application/application-controller.vala @@ -134,13 +134,13 @@ internal class Application.Controller : Geary.BaseObject { this.upgrade_dialog = new UpgradeDialog(application); // Initialise WebKit and WebViews - ClientWebView.init_web_context( + Components.WebView.init_web_context( this.application.config, this.application.get_web_extensions_dir(), this.application.get_user_cache_directory().get_child("web-resources") ); try { - ClientWebView.load_resources( + Components.WebView.load_resources( this.application.get_user_config_directory() ); Composer.WebView.load_resources(); diff --git a/src/client/components/client-web-view.vala b/src/client/components/components-web-view.vala similarity index 95% rename from src/client/components/client-web-view.vala rename to src/client/components/components-web-view.vala index 5046ab65..e4c3581c 100644 --- a/src/client/components/client-web-view.vala +++ b/src/client/components/components-web-view.vala @@ -14,7 +14,7 @@ * integration, Inspector support, and remote and inline image * handling. */ -public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { +public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface { /** URI Scheme and delimiter for internal resource loads. */ @@ -86,13 +86,13 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { context.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER); context.register_uri_scheme("cid", (req) => { - ClientWebView? view = req.get_web_view() as ClientWebView; + WebView? view = req.get_web_view() as WebView; if (view != null) { view.handle_cid_request(req); } }); context.register_uri_scheme("geary", (req) => { - ClientWebView? view = req.get_web_view() as ClientWebView; + WebView? view = req.get_web_view() as WebView; if (view != null) { view.handle_internal_request(req); } @@ -113,25 +113,25 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { update_spellcheck(context, config); }); - ClientWebView.default_context = context; + WebView.default_context = context; } /** - * Loads static resources used by ClientWebView. + * Loads static resources used by WebView. */ public static void load_resources(GLib.File user_dir) throws GLib.Error { - ClientWebView.script = load_app_script( - "client-web-view.js" + WebView.script = load_app_script( + "components-web-view.js" ); - ClientWebView.allow_remote_images = load_app_script( - "client-web-view-allow-remote-images.js" + WebView.allow_remote_images = load_app_script( + "components-web-view-allow-remote-images.js" ); foreach (string name in new string[] { USER_CSS, USER_CSS_LEGACY }) { GLib.File stylesheet = user_dir.get_child(name); try { - ClientWebView.user_stylesheet = load_user_stylesheet(stylesheet); + WebView.user_stylesheet = load_user_stylesheet(stylesheet); break; } catch (GLib.IOError.NOT_FOUND err) { // All good, try the next one or just exit @@ -298,7 +298,7 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { public signal void remote_image_load_blocked(); - protected ClientWebView(Application.Configuration config, + protected WebView(Application.Configuration config, WebKit.UserContentManager? custom_manager = null) { WebKit.Settings setts = new WebKit.Settings(); setts.allow_modal_dialogs = false; @@ -320,13 +320,13 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { WebKit.UserContentManager content_manager = custom_manager ?? new WebKit.UserContentManager(); - content_manager.add_script(ClientWebView.script); - if (ClientWebView.user_stylesheet != null) { - content_manager.add_style_sheet(ClientWebView.user_stylesheet); + content_manager.add_script(WebView.script); + if (WebView.user_stylesheet != null) { + content_manager.add_style_sheet(WebView.user_stylesheet); } Object( - web_context: ClientWebView.default_context, + web_context: WebView.default_context, user_content_manager: content_manager, settings: setts ); @@ -375,7 +375,7 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { "monospace-font", SettingsBindFlags.DEFAULT); } - ~ClientWebView() { + ~WebView() { base_unref(); } @@ -434,11 +434,11 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { public void allow_remote_image_loading() { // Use a separate script here since we need to update the // value of window.geary.allow_remote_image_loading after it - // was first created by client-web-view.js (which is loaded at + // was first created by components-web-view.js (which is loaded at // the start of page load), but before the page load is // started (so that any remote images present are actually // loaded). - this.user_content_manager.add_script(ClientWebView.allow_remote_images); + this.user_content_manager.add_script(WebView.allow_remote_images); } /** @@ -514,7 +514,7 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface { JavaScriptMessageHandler handler) { // XXX can't use the delegate directly, see b.g.o Bug // 604781. However the workaround below creates a circular - // reference, causing ClientWebView instances to leak. So to + // reference, causing WebView instances to leak. So to // work around that we need to record handler ids and // disconnect them when being destroyed. ulong id = this.user_content_manager.script_message_received[name].connect( diff --git a/src/client/composer/composer-web-view.vala b/src/client/composer/composer-web-view.vala index cb3410d9..7f73becd 100644 --- a/src/client/composer/composer-web-view.vala +++ b/src/client/composer/composer-web-view.vala @@ -9,7 +9,7 @@ /** * A WebView for editing messages in the composer. */ -public class Composer.WebView : ClientWebView { +public class Composer.WebView : Components.WebView { // WebKit message handler names @@ -83,10 +83,10 @@ public class Composer.WebView : ClientWebView { public static new void load_resources() throws Error { - WebView.app_style = ClientWebView.load_app_stylesheet( + WebView.app_style = Components.WebView.load_app_stylesheet( "composer-web-view.css" ); - WebView.app_script = ClientWebView.load_app_script( + WebView.app_script = Components.WebView.load_app_script( "composer-web-view.js" ); } diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala index 9bbd6660..af80729d 100644 --- a/src/client/composer/composer-widget.vala +++ b/src/client/composer/composer-widget.vala @@ -1283,7 +1283,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface { email.inline_files.set_all(this.inline_files); email.cid_files.set_all(this.cid_files); - email.img_src_prefix = ClientWebView.INTERNAL_URL_PREFIX; + email.img_src_prefix = Components.WebView.INTERNAL_URL_PREFIX; try { if (!for_draft) { @@ -2051,7 +2051,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface { string unique_filename; add_inline_part(byte_buffer, filename, out unique_filename); this.editor.insert_image( - ClientWebView.INTERNAL_URL_PREFIX + unique_filename + Components.WebView.INTERNAL_URL_PREFIX + unique_filename ); } catch (Error error) { warning("Failed to paste image %s", error.message); @@ -2705,7 +2705,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface { string unique_filename; add_inline_part(file_buffer, path, out unique_filename); this.editor.insert_image( - ClientWebView.INTERNAL_URL_PREFIX + unique_filename + Components.WebView.INTERNAL_URL_PREFIX + unique_filename ); } catch (Error err) { attachment_failed(err.message); @@ -2804,7 +2804,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface { } this.editor.insert_image( - ClientWebView.INTERNAL_URL_PREFIX + unique_filename + Components.WebView.INTERNAL_URL_PREFIX + unique_filename ); } } diff --git a/src/client/conversation-viewer/conversation-email.vala b/src/client/conversation-viewer/conversation-email.vala index ac9b23f1..2f2e9006 100644 --- a/src/client/conversation-viewer/conversation-email.vala +++ b/src/client/conversation-viewer/conversation-email.vala @@ -906,8 +906,8 @@ public class ConversationEmail : Gtk.Box, Geary.BaseInterface { Geary.Memory.Buffer? content) { var main = get_toplevel() as Application.MainWindow; if (main != null) { - if (uri.has_prefix(ClientWebView.CID_URL_PREFIX)) { - string cid = uri.substring(ClientWebView.CID_URL_PREFIX.length); + if (uri.has_prefix(Components.WebView.CID_URL_PREFIX)) { + string cid = uri.substring(Components.WebView.CID_URL_PREFIX.length); try { Geary.Attachment attachment = this.email.get_attachment_by_content_id( cid diff --git a/src/client/conversation-viewer/conversation-message.vala b/src/client/conversation-viewer/conversation-message.vala index df64b90b..f70c70c9 100644 --- a/src/client/conversation-viewer/conversation-message.vala +++ b/src/client/conversation-viewer/conversation-message.vala @@ -1077,7 +1077,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface { return "\"%s\"".printf( clean_filename, REPLACED_IMAGE_CLASS, - ClientWebView.CID_URL_PREFIX, + Components.WebView.CID_URL_PREFIX, Geary.HTML.escape_markup(id) ); } @@ -1358,7 +1358,7 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface { alt_text = (string) alt_maybe; } - if (uri.has_prefix(ClientWebView.CID_URL_PREFIX)) { + if (uri.has_prefix(Components.WebView.CID_URL_PREFIX)) { // We can get the data directly from the attachment, so // don't bother getting it from the web view save_image(uri, alt_text, null); diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala index d22a836e..27a2cf34 100644 --- a/src/client/conversation-viewer/conversation-web-view.vala +++ b/src/client/conversation-viewer/conversation-web-view.vala @@ -6,7 +6,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ -public class ConversationWebView : ClientWebView { +public class ConversationWebView : Components.WebView { private const string DECEPTIVE_LINK_CLICKED = "deceptiveLinkClicked"; @@ -41,10 +41,10 @@ public class ConversationWebView : ClientWebView { public static new void load_resources() throws Error { - ConversationWebView.app_script = ClientWebView.load_app_script( + ConversationWebView.app_script = Components.WebView.load_app_script( "conversation-web-view.js" ); - ConversationWebView.app_stylesheet = ClientWebView.load_app_stylesheet( + ConversationWebView.app_stylesheet = Components.WebView.load_app_stylesheet( "conversation-web-view.css" ); } diff --git a/src/client/meson.build b/src/client/meson.build index aa76e040..a7c85817 100644 --- a/src/client/meson.build +++ b/src/client/meson.build @@ -28,7 +28,6 @@ geary_client_vala_sources = files( 'client-action.vala', - 'components/client-web-view.vala', 'components/components-attachment-pane.vala', 'components/components-entry-undo.vala', 'components/components-inspector.vala', @@ -39,6 +38,7 @@ geary_client_vala_sources = files( 'components/components-placeholder-pane.vala', 'components/components-preferences-window.vala', 'components/components-validator.vala', + 'components/components-web-view.vala', 'components/count-badge.vala', 'components/folder-popover.vala', 'components/icon-factory.vala', diff --git a/test/client/components/client-web-view-test-case.vala b/test/client/components/components-web-view-test-case.vala similarity index 78% rename from test/client/components/client-web-view-test-case.vala rename to test/client/components/components-web-view-test-case.vala index d1212afb..5ebdf4cc 100644 --- a/test/client/components/client-web-view-test-case.vala +++ b/test/client/components/components-web-view-test-case.vala @@ -6,22 +6,22 @@ */ -public abstract class ClientWebViewTestCase : TestCase { +public abstract class Components.WebViewTestCase : TestCase { protected V? test_view = null; protected Application.Configuration? config = null; - protected ClientWebViewTestCase(string name) { + protected WebViewTestCase(string name) { base(name); this.config = new Application.Configuration(Application.Client.SCHEMA_ID); this.config.enable_debug = true; - ClientWebView.init_web_context( + WebView.init_web_context( this.config, File.new_for_path(_BUILD_ROOT_DIR).get_child("src"), File.new_for_path("/tmp") // XXX use something better here ); try { - ClientWebView.load_resources(GLib.File.new_for_path("/tmp")); + WebView.load_resources(GLib.File.new_for_path("/tmp")); } catch (GLib.Error err) { assert_not_reached(); } @@ -34,7 +34,7 @@ public abstract class ClientWebViewTestCase : TestCase { protected abstract V set_up_test_view(); protected virtual void load_body_fixture(string html = "") { - ClientWebView client_view = (ClientWebView) this.test_view; + WebView client_view = (WebView) this.test_view; client_view.load_html(html); while (!client_view.is_content_loaded) { Gtk.main_iteration(); @@ -42,7 +42,7 @@ public abstract class ClientWebViewTestCase : TestCase { } protected WebKit.JavascriptResult run_javascript(string command) throws Error { - ClientWebView view = (ClientWebView) this.test_view; + WebView view = (WebView) this.test_view; view.run_javascript.begin( command, null, (obj, res) => { async_complete(res); } ); diff --git a/test/client/components/client-web-view-test.vala b/test/client/components/components-web-view-test.vala similarity index 79% rename from test/client/components/client-web-view-test.vala rename to test/client/components/components-web-view-test.vala index d08e5192..d3e1037c 100644 --- a/test/client/components/client-web-view-test.vala +++ b/test/client/components/components-web-view-test.vala @@ -5,10 +5,10 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ -public class ClientWebViewTest : TestCase { +public class Components.WebViewTest : TestCase { - public ClientWebViewTest() { - base("ClientWebViewTest"); + public WebViewTest() { + base("Components.WebViewTest"); add_test("init_web_context", init_web_context); add_test("load_resources", load_resources); } @@ -18,7 +18,7 @@ public class ClientWebViewTest : TestCase { Application.Client.SCHEMA_ID ); config.enable_debug = true; - ClientWebView.init_web_context( + WebView.init_web_context( config, File.new_for_path(_BUILD_ROOT_DIR).get_child("src"), File.new_for_path("/tmp") // XXX use something better here @@ -27,7 +27,7 @@ public class ClientWebViewTest : TestCase { public void load_resources() throws GLib.Error { try { - ClientWebView.load_resources(GLib.File.new_for_path("/tmp")); + WebView.load_resources(GLib.File.new_for_path("/tmp")); } catch (GLib.Error err) { assert_not_reached(); } diff --git a/test/client/composer/composer-web-view-test.vala b/test/client/composer/composer-web-view-test.vala index 0b72d9d5..64828f04 100644 --- a/test/client/composer/composer-web-view-test.vala +++ b/test/client/composer/composer-web-view-test.vala @@ -5,7 +5,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ -public class Composer.WebViewTest : ClientWebViewTestCase { +public class Composer.WebViewTest : Components.WebViewTestCase { public WebViewTest() { diff --git a/test/js/client-page-state-test.vala b/test/js/components-page-state-test.vala similarity index 73% rename from test/js/client-page-state-test.vala rename to test/js/components-page-state-test.vala index d763dcc3..e0f728ce 100644 --- a/test/js/client-page-state-test.vala +++ b/test/js/components-page-state-test.vala @@ -5,24 +5,24 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ -class ClientPageStateTest : ClientWebViewTestCase { +class Components.PageStateTest : WebViewTestCase { - private class TestClientWebView : ClientWebView { + private class TestWebView : Components.WebView { - public TestClientWebView(Application.Configuration config) { + public TestWebView(Application.Configuration config) { base(config); } } - public ClientPageStateTest() { - base("ClientPageStateTest"); + public PageStateTest() { + base("Components.PageStateTest"); add_test("content_loaded", content_loaded); try { - ClientWebView.load_resources(GLib.File.new_for_path("/tmp")); + WebView.load_resources(GLib.File.new_for_path("/tmp")); } catch (GLib.Error err) { assert_not_reached(); } @@ -45,7 +45,7 @@ class ClientPageStateTest : ClientWebViewTestCase { assert(content_loaded_triggered); } - protected override ClientWebView set_up_test_view() { + protected override WebView set_up_test_view() { WebKit.UserScript test_script; test_script = new WebKit.UserScript( "var geary = new PageState()", @@ -55,7 +55,7 @@ class ClientPageStateTest : ClientWebViewTestCase { null ); - ClientWebView view = new TestClientWebView(this.config); + WebView view = new TestWebView(this.config); view.get_user_content_manager().add_script(test_script); return view; } diff --git a/test/js/composer-page-state-test.vala b/test/js/composer-page-state-test.vala index a9af1a78..dfb8566c 100644 --- a/test/js/composer-page-state-test.vala +++ b/test/js/composer-page-state-test.vala @@ -5,7 +5,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ -class Composer.PageStateTest : ClientWebViewTestCase { +class Composer.PageStateTest : Components.WebViewTestCase { public const string COMPLETE_BODY_TEMPLATE = """
%s


"""; diff --git a/test/js/conversation-page-state-test.vala b/test/js/conversation-page-state-test.vala index ba68cfde..d0b76bc4 100644 --- a/test/js/conversation-page-state-test.vala +++ b/test/js/conversation-page-state-test.vala @@ -5,7 +5,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ -class ConversationPageStateTest : ClientWebViewTestCase { +class ConversationPageStateTest : Components.WebViewTestCase { public ConversationPageStateTest() { base("ConversationPageStateTest"); diff --git a/test/meson.build b/test/meson.build index 38a3aae2..89f0cbb8 100644 --- a/test/meson.build +++ b/test/meson.build @@ -82,16 +82,16 @@ geary_test_client_sources = [ 'client/accounts/accounts-manager-test.vala', 'client/application/application-client-test.vala', 'client/application/application-configuration-test.vala', - 'client/components/client-web-view-test.vala', - 'client/components/client-web-view-test-case.vala', 'client/components/components-validator-test.vala', + 'client/components/components-web-view-test-case.vala', + 'client/components/components-web-view-test.vala', 'client/composer/composer-web-view-test.vala', 'client/util/util-avatar-test.vala', 'client/util/util-cache-test.vala', 'client/util/util-email-test.vala', 'client/util/util-js-test.vala', - 'js/client-page-state-test.vala', + 'js/components-page-state-test.vala', 'js/composer-page-state-test.vala', 'js/conversation-page-state-test.vala', diff --git a/test/test-client.vala b/test/test-client.vala index 1016d2a5..115eb9e3 100644 --- a/test/test-client.vala +++ b/test/test-client.vala @@ -51,9 +51,9 @@ int main(string[] args) { client.add_suite(new Accounts.ManagerTest().get_suite()); client.add_suite(new Application.ClientTest().get_suite()); client.add_suite(new Application.ConfigurationTest().get_suite()); - client.add_suite(new ClientWebViewTest().get_suite()); - client.add_suite(new Composer.WebViewTest().get_suite()); client.add_suite(new Components.ValidatorTest().get_suite()); + client.add_suite(new Components.WebViewTest().get_suite()); + client.add_suite(new Composer.WebViewTest().get_suite()); client.add_suite(new Util.Avatar.Test().get_suite()); client.add_suite(new Util.Cache.Test().get_suite()); client.add_suite(new Util.Email.Test().get_suite()); @@ -61,7 +61,7 @@ int main(string[] args) { TestSuite js = new TestSuite("js"); - js.add_suite(new ClientPageStateTest().get_suite()); + js.add_suite(new Components.PageStateTest().get_suite()); js.add_suite(new Composer.PageStateTest().get_suite()); js.add_suite(new ConversationPageStateTest().get_suite()); diff --git a/ui/client-web-view-allow-remote-images.js b/ui/components-web-view-allow-remote-images.js similarity index 100% rename from ui/client-web-view-allow-remote-images.js rename to ui/components-web-view-allow-remote-images.js diff --git a/ui/client-web-view.js b/ui/components-web-view.js similarity index 99% rename from ui/client-web-view.js rename to ui/components-web-view.js index 75bdecf1..90f4cc14 100644 --- a/ui/client-web-view.js +++ b/ui/components-web-view.js @@ -6,7 +6,7 @@ */ /** - * Application logic for ClientWebView and subclasses. + * Application logic for Components.WebView and subclasses. */ let PageState = function() { diff --git a/ui/org.gnome.Geary.gresource.xml b/ui/org.gnome.Geary.gresource.xml index 8ad731f0..fef3b445 100644 --- a/ui/org.gnome.Geary.gresource.xml +++ b/ui/org.gnome.Geary.gresource.xml @@ -9,8 +9,8 @@ accounts_editor_servers_pane.ui application-main-window.ui certificate_warning_dialog.glade - client-web-view.js - client-web-view-allow-remote-images.js + components-web-view.js + components-web-view-allow-remote-images.js components-attachment-pane.ui components-attachment-pane-menus.ui components-attachment-view.ui