aboutsummaryrefslogtreecommitdiffstats
path: root/src
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 /src
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 'src')
-rw-r--r--src/ephy-encoding-dialog.c2
-rw-r--r--src/ephy-notebook.c2
-rw-r--r--src/ephy-session.c4
-rw-r--r--src/ephy-shell.c2
-rw-r--r--src/ephy-window.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 8da22cdbe..822937cf4 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -139,7 +139,7 @@ embed_net_stop_cb (EphyWebView *view,
GParamSpec *pspec,
EphyEncodingDialog *dialog)
{
- if (ephy_web_view_get_load_status (view) == FALSE)
+ if (ephy_web_view_is_loading (view) == FALSE)
sync_encoding_against_embed (dialog);
}
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index bcc7de531..ff8815553 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -509,7 +509,7 @@ sync_load_status (EphyWebView *view, GParamSpec *pspec, GtkWidget *proxy)
icon = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "icon"));
g_return_if_fail (spinner != NULL && icon != NULL);
- if (ephy_web_view_get_load_status (view))
+ if (ephy_web_view_is_loading (view))
{
gtk_widget_hide (icon);
gtk_widget_show (spinner);
diff --git a/src/ephy-session.c b/src/ephy-session.c
index f85cc4fdf..e4c158749 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -380,7 +380,7 @@ load_status_notify_cb (EphyWebView *view,
GParamSpec *pspec,
EphySession *session)
{
- if (ephy_web_view_get_load_status (view) == FALSE)
+ if (ephy_web_view_is_loading (view) == FALSE)
ephy_session_save (session, SESSION_CRASHED);
}
@@ -1039,7 +1039,7 @@ write_tab (xmlTextWriterPtr writer,
(const xmlChar *) title);
if (ret < 0) return ret;
- if (ephy_web_view_get_load_status (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)))
+ if (ephy_web_view_is_loading (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)))
{
ret = xmlTextWriterWriteAttribute (writer,
(const xmlChar *) "loading",
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 27f2de784..e6b56d376 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -475,7 +475,7 @@ ephy_shell_new_tab_full (EphyShell *shell,
if (embed != NULL)
{
if (ephy_web_view_get_is_blank (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)) &&
- ephy_web_view_get_load_status (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)) == FALSE)
+ ephy_web_view_is_loading (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)) == FALSE)
{
active_is_blank = TRUE;
}
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 51de4b4f5..8407104d2 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1624,7 +1624,7 @@ sync_tab_load_progress (EphyWebView *view, GParamSpec *pspec, EphyWindow *window
for about:blank until the load is finished, so assume NULL
here means we are loading about:blank. This might not be
rigt :) */
- loading = ephy_web_view_get_load_status (view);
+ loading = ephy_web_view_is_loading (view);
uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (view));
if (loading && (!uri || strcmp (uri, "about:blank") == 0))
return;
@@ -1869,7 +1869,7 @@ sync_tab_load_status (EphyWebView *view,
if (window->priv->closing) return;
- loading = ephy_web_view_get_load_status (view);
+ loading = ephy_web_view_is_loading (view);
action = gtk_action_group_get_action (action_group, "ViewStop");
gtk_action_set_sensitive (action, loading);