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.

7 files changed, 14 insertions, 14 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);
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 69b00ae71..dd92b9d5d 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -177,7 +177,7 @@ void                       ephy_web_view_load_url                (EphyWebView
                                                                   const char                      *url);
 void                       ephy_web_view_copy_back_history       (EphyWebView                     *source,
                                                                   EphyWebView                     *dest);
-gboolean                   ephy_web_view_get_load_status         (EphyWebView                     *view);
+gboolean                   ephy_web_view_is_loading              (EphyWebView                     *view);
 const char *               ephy_web_view_get_loading_title       (EphyWebView                     *view);
 GdkPixbuf *                ephy_web_view_get_icon                (EphyWebView                     *view);
 EphyWebViewDocumentType    ephy_web_view_get_document_type       (EphyWebView                     *view);
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);