aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-web-view.c
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-08-25 18:36:07 +0800
committerXan Lopez <xan@gnome.org>2009-08-25 18:36:07 +0800
commiteb16610ca83c149cf69344777fa1511396a9ca6b (patch)
tree4fd7b74577651e71cd235f0b0f0ac0b20155bf94 /embed/ephy-web-view.c
parent5bd0ebcc3daa9d847e484890a874905208395d80 (diff)
downloadgsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.tar
gsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.tar.gz
gsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.tar.bz2
gsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.tar.lz
gsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.tar.xz
gsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.tar.zst
gsoc2013-epiphany-eb16610ca83c149cf69344777fa1511396a9ca6b.zip
Rename ephy_web_view_get_load_status to ephy_web_view_is_loading
Much more clear, and avoids confusions with the WebKitWebView function with similar name.
Diffstat (limited to 'embed/ephy-web-view.c')
-rw-r--r--embed/ephy-web-view.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 2c8d66d48..6bd0196cf 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1138,7 +1138,7 @@ ephy_web_view_set_address (EphyWebView *view,
priv->is_blank = address == NULL ||
strcmp (address, "about:blank") == 0;
- if (ephy_web_view_get_load_status (view) &&
+ if (ephy_web_view_is_loading (view) &&
priv->address_expire == EPHY_WEB_VIEW_ADDRESS_EXPIRE_NOW &&
priv->typed_address != NULL) {
g_free (priv->typed_address);
@@ -1396,7 +1396,7 @@ ephy_web_view_file_monitor_reload_cb (EphyWebView *view)
return TRUE;
}
- if (ephy_web_view_get_load_status (view)) {
+ if (ephy_web_view_is_loading (view)) {
/* Wait a bit to reload if we're still loading! */
priv->reload_delay_ticks = RELOAD_DELAY_MAX_TICKS / 2;
@@ -1615,7 +1615,7 @@ ephy_web_view_can_go_up (EphyWebView *view)
}
/**
- * ephy_web_view_get_load_status:
+ * ephy_web_view_is_loading:
* @view: an #EphyWebView
*
* Returns whether the web page in @view has finished loading. A web page is
@@ -1625,7 +1625,7 @@ ephy_web_view_can_go_up (EphyWebView *view)
* Return value: %TRUE if the page is still loading, %FALSE if complete
**/
gboolean
-ephy_web_view_get_load_status (EphyWebView *view)
+ephy_web_view_is_loading (EphyWebView *view)
{
WebKitLoadStatus status;
@@ -1869,7 +1869,7 @@ ephy_web_view_set_typed_address (EphyWebView *view,
priv->typed_address = g_strdup (address);
if (expire == EPHY_WEB_VIEW_ADDRESS_EXPIRE_CURRENT &&
- !ephy_web_view_get_load_status (view)) {
+ !ephy_web_view_is_loading (view)) {
priv->address_expire = EPHY_WEB_VIEW_ADDRESS_EXPIRE_NOW;
} else {
priv->address_expire = expire;
@@ -2064,7 +2064,7 @@ ephy_web_view_get_title_composite (EphyWebView *view)
g_return_val_if_fail (EPHY_IS_WEB_VIEW (view), NULL);
- is_loading = ephy_web_view_get_load_status (view);
+ is_loading = ephy_web_view_is_loading (view);
is_blank = ephy_web_view_get_is_blank (view);
loading_title = ephy_web_view_get_loading_title (view);
title = ephy_web_view_get_title (view);