[epiphany] ephy-web-view: Use webkit_web_view_load_uri() instead of webkit_web_view_open()
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: Use webkit_web_view_load_uri() instead of webkit_web_view_open()
- Date: Thu, 21 Jun 2012 10:46:01 +0000 (UTC)
commit a8767266443074689200fff9ca43531d88d65aed
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Thu Jun 21 12:30:16 2012 +0200
ephy-web-view: Use webkit_web_view_load_uri() instead of webkit_web_view_open()
webkit_web_view_open() is deprecated in WebKit1 and
webkit_web_view_load_uri() is compatible with WebKit2.
embed/ephy-web-view.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index a3677e9..5aa5bff 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2493,7 +2493,7 @@ effective_url_head_cb (SoupSession *session,
if (message->status_code == SOUP_STATUS_OK) {
char *uri = soup_uri_to_string (soup_message_get_uri (message), FALSE);
- webkit_web_view_open (WEBKIT_WEB_VIEW (view), uri);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), uri);
g_free (uri);
} else {
@@ -2508,7 +2508,7 @@ effective_url_head_cb (SoupSession *session,
g_error_free (error);
/* Load the original URI to trigger an error in the view. */
- webkit_web_view_open (WEBKIT_WEB_VIEW (view), data->original_uri);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), data->original_uri);
}
}
@@ -2565,7 +2565,7 @@ ephy_web_view_load_url (EphyWebView *view,
/* If we cannot even create a message fallback to the effective
* url, the gtk_show_uri code will make another attempt in
* EphyWindow's policy code. */
- webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), effective_url);
}
g_free (temp_url);
@@ -2576,7 +2576,7 @@ ephy_web_view_load_url (EphyWebView *view,
webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view), decoded_url);
g_free (decoded_url);
} else
- webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), effective_url);
g_free (effective_url);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]