[evolution/wip/mcrha/webkit-jsc-api] Remove unused e_web_view_get_content_html()
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/mcrha/webkit-jsc-api] Remove unused e_web_view_get_content_html()
- Date: Tue, 1 Oct 2019 06:53:17 +0000 (UTC)
commit 0fa02a7f982813b52dc860fe6667ed4f8510a918
Author: Milan Crha <mcrha redhat com>
Date: Tue Oct 1 08:53:53 2019 +0200
Remove unused e_web_view_get_content_html()
src/e-util/e-web-view.c | 53 ----------------------------------------------
src/e-util/e-web-view.h | 8 -------
src/e-util/test-web-view.c | 43 -------------------------------------
3 files changed, 104 deletions(-)
---
diff --git a/src/e-util/e-web-view.c b/src/e-util/e-web-view.c
index 6863568f7d..d79f765c93 100644
--- a/src/e-util/e-web-view.c
+++ b/src/e-util/e-web-view.c
@@ -2737,59 +2737,6 @@ e_web_view_reload (EWebView *web_view)
webkit_web_view_reload (WEBKIT_WEB_VIEW (web_view));
}
-static void
-get_document_content_html_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- GTask *task = user_data;
- GSList *texts = NULL;
- GError *local_error = NULL;
-
- g_return_if_fail (E_IS_WEB_VIEW (source_object));
- g_return_if_fail (G_IS_TASK (task));
-
- e_web_view_jsc_get_document_content_finish (WEBKIT_WEB_VIEW (source_object), result, &texts,
&local_error);
-
- if (local_error) {
- g_task_return_error (task, local_error);
- g_warn_if_fail (texts == NULL);
- } else {
- g_task_return_pointer (task, texts ? texts->data : NULL, g_free);
- /* The texts::data is owned by the task now */
- g_slist_free (texts);
- }
-
- g_object_unref (task);
-}
-
-void
-e_web_view_get_content_html (EWebView *web_view,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- GTask *task;
-
- g_return_if_fail (E_IS_WEB_VIEW (web_view));
-
- task = g_task_new (web_view, cancellable, callback, user_data);
-
- e_web_view_jsc_get_document_content (WEBKIT_WEB_VIEW (web_view), "", E_TEXT_FORMAT_HTML,
- cancellable, get_document_content_html_cb, g_object_ref (task));
-}
-
-gchar *
-e_web_view_get_content_html_finish (EWebView *web_view,
- GAsyncResult *result,
- GError **error)
-{
- g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
- g_return_val_if_fail (g_task_is_valid (result, web_view), FALSE);
-
- return g_task_propagate_pointer (G_TASK (result), error);
-}
-
gboolean
e_web_view_get_caret_mode (EWebView *web_view)
{
diff --git a/src/e-util/e-web-view.h b/src/e-util/e-web-view.h
index fa5778157c..de1ec6c123 100644
--- a/src/e-util/e-web-view.h
+++ b/src/e-util/e-web-view.h
@@ -143,14 +143,6 @@ void e_web_view_load_uri (EWebView *web_view,
gchar * e_web_view_suggest_filename (EWebView *web_view,
const gchar *uri);
void e_web_view_reload (EWebView *web_view);
-void e_web_view_get_content_html (EWebView *web_view,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gchar * e_web_view_get_content_html_finish
- (EWebView *web_view,
- GAsyncResult *result,
- GError **error);
GDBusProxy * e_web_view_get_web_extension_proxy
(EWebView *web_view);
gboolean e_web_view_get_caret_mode (EWebView *web_view);
diff --git a/src/e-util/test-web-view.c b/src/e-util/test-web-view.c
index f150c046e7..6033164f08 100644
--- a/src/e-util/test-web-view.c
+++ b/src/e-util/test-web-view.c
@@ -1427,48 +1427,6 @@ test_get_element_content_verify (TestFixture *fixture,
test_utils_wait (fixture);
}
-static void
-test_get_content_html_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- GetContentData *gcd = user_data;
- GSList *texts = NULL;
- gchar *text;
- GError *error = NULL;
-
- g_assert (WEBKIT_IS_WEB_VIEW (source_object));
- g_assert_nonnull (gcd);
-
- text = e_web_view_get_content_html_finish (E_WEB_VIEW (source_object), result, &error);
-
- g_assert_no_error (error);
-
- if (text)
- texts = g_slist_prepend (texts, text);
-
- test_verify_get_content_data (gcd, texts);
-
- g_slist_free_full (texts, g_free);
-
- test_flag_set (gcd->fixture->flag);
-}
-
-static void
-test_get_content_html_verify (TestFixture *fixture,
- const gchar *expect_html)
-{
- GetContentData gcd;
-
- gcd.fixture = fixture;
- gcd.expect_plain = NULL;
- gcd.expect_html = expect_html;
-
- e_web_view_get_content_html (E_WEB_VIEW (fixture->web_view), NULL, test_get_content_html_ready_cb,
&gcd);
-
- test_utils_wait (fixture);
-}
-
static void
test_get_content (TestFixture *fixture)
{
@@ -1504,7 +1462,6 @@ test_get_content (TestFixture *fixture)
test_get_document_content_verify (fixture, "", expect_plain, NULL);
test_get_document_content_verify (fixture, "", NULL, expect_html);
test_get_document_content_verify (fixture, "", expect_plain, expect_html);
- test_get_content_html_verify (fixture, expect_html);
expect_plain = "frm1 div";
expect_html = html_frm1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]