aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-07-23 05:29:25 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-07-27 14:16:53 +0800
commit14b4291ebd16d3f9efddad49ec726d92edb258bc (patch)
tree22c208903af95dcb1e8a34d8ae576401a06d378c
parentf8864692d1e85ea1ed4dbfc7342f27d2f6d52243 (diff)
downloadgsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.tar
gsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.tar.gz
gsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.tar.bz2
gsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.tar.lz
gsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.tar.xz
gsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.tar.zst
gsoc2013-evolution-14b4291ebd16d3f9efddad49ec726d92edb258bc.zip
Remove e_web_view_get_uri().
Trivial wrapper for webkit_web_view_get_uri(). Probably made sense while we were transitioning from GtkHTML to WebKit, but we don't need it anymore.
-rw-r--r--doc/reference/evolution-util/evolution-util-sections.txt1
-rw-r--r--e-util/e-web-view.c8
-rw-r--r--e-util/e-web-view.h1
-rw-r--r--mail/e-mail-display.c2
4 files changed, 1 insertions, 11 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt
index 4816728208..2a6d4a1eab 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -4355,7 +4355,6 @@ e_web_view_new
e_web_view_clear
e_web_view_load_string
e_web_view_load_uri
-e_web_view_get_uri
e_web_view_reload
e_web_view_get_html
e_web_view_get_caret_mode
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index 6fd81ba177..38320baa3c 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -1819,14 +1819,6 @@ e_web_view_reload (EWebView *web_view)
webkit_web_view_reload (WEBKIT_WEB_VIEW (web_view));
}
-const gchar *
-e_web_view_get_uri (EWebView *web_view)
-{
- g_return_val_if_fail (E_IS_WEB_VIEW (web_view), NULL);
-
- return webkit_web_view_get_uri (WEBKIT_WEB_VIEW (web_view));
-}
-
gchar *
e_web_view_get_html (EWebView *web_view)
{
diff --git a/e-util/e-web-view.h b/e-util/e-web-view.h
index 4f782b9e53..9eec4956fd 100644
--- a/e-util/e-web-view.h
+++ b/e-util/e-web-view.h
@@ -102,7 +102,6 @@ void e_web_view_load_string (EWebView *web_view,
const gchar *string);
void e_web_view_load_uri (EWebView *web_view,
const gchar *uri);
-const gchar * e_web_view_get_uri (EWebView *web_view);
void e_web_view_reload (EWebView *web_view);
gchar * e_web_view_get_html (EWebView *web_view);
gboolean e_web_view_get_caret_mode (EWebView *web_view);
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 44f78df4e4..14e88d0013 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1889,7 +1889,7 @@ do_reload_display (EMailDisplay *display)
const gchar *default_charset, *charset;
web_view = E_WEB_VIEW (display);
- uri = (gchar *) e_web_view_get_uri (web_view);
+ uri = (gchar *) webkit_web_view_get_uri (WEBKIT_WEB_VIEW (web_view));
display->priv->scheduled_reload = 0;