[evolution/wip/mcrha/webkit-jsc-api] e-editor-web-extension.c: Move web_page_send_request_cb() in the code



commit 60e62f8c98b3bfb98e2d5f6dbb96c5c2ee752515
Author: Milan Crha <mcrha redhat com>
Date:   Thu Apr 23 09:50:05 2020 +0200

    e-editor-web-extension.c: Move web_page_send_request_cb() in the code

 .../web-extension/e-editor-web-extension.c         | 60 +++++++++++-----------
 1 file changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c 
b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
index a75de0ee20..07667f87d7 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
+++ b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
@@ -75,36 +75,6 @@ e_editor_web_extension_get_default (void)
        return E_EDITOR_WEB_EXTENSION (g_once (&once_init, e_editor_web_extension_create_instance, NULL));
 }
 
-static gboolean
-web_page_send_request_cb (WebKitWebPage *web_page,
-                         WebKitURIRequest *request,
-                         WebKitURIResponse *redirected_response,
-                         EEditorWebExtension *extension)
-{
-       const gchar *request_uri;
-       const gchar *page_uri;
-
-       request_uri = webkit_uri_request_get_uri (request);
-       page_uri = webkit_web_page_get_uri (web_page);
-
-       /* Always load the main resource. */
-       if (g_strcmp0 (request_uri, page_uri) == 0)
-               return FALSE;
-
-       if (g_str_has_prefix (request_uri, "http:") ||
-           g_str_has_prefix (request_uri, "https:")) {
-               gchar *new_uri;
-
-               new_uri = g_strconcat ("evo-", request_uri, NULL);
-
-               webkit_uri_request_set_uri (request, new_uri);
-
-               g_free (new_uri);
-       }
-
-       return FALSE;
-}
-
 static gboolean
 use_sources_js_file (void)
 {
@@ -542,6 +512,36 @@ window_object_cleared_cb (WebKitScriptWorld *world,
        g_clear_object (&jsc_context);
 }
 
+static gboolean
+web_page_send_request_cb (WebKitWebPage *web_page,
+                         WebKitURIRequest *request,
+                         WebKitURIResponse *redirected_response,
+                         EEditorWebExtension *extension)
+{
+       const gchar *request_uri;
+       const gchar *page_uri;
+
+       request_uri = webkit_uri_request_get_uri (request);
+       page_uri = webkit_web_page_get_uri (web_page);
+
+       /* Always load the main resource. */
+       if (g_strcmp0 (request_uri, page_uri) == 0)
+               return FALSE;
+
+       if (g_str_has_prefix (request_uri, "http:") ||
+           g_str_has_prefix (request_uri, "https:")) {
+               gchar *new_uri;
+
+               new_uri = g_strconcat ("evo-", request_uri, NULL);
+
+               webkit_uri_request_set_uri (request, new_uri);
+
+               g_free (new_uri);
+       }
+
+       return FALSE;
+}
+
 static void
 web_page_document_loaded_cb (WebKitWebPage *web_page,
                             gpointer user_data)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]