diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-02-02 09:09:24 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <descalante@igalia.com> | 2010-02-02 09:11:26 +0800 |
| commit | 0149582ef3d39e8e69c746e167a42356983b79d9 (patch) | |
| tree | 9274a33428130fc92cd1d208a6318c998bbc2a4e | |
| parent | d3f48332910e5f46e0d3599c771a99d709b0b780 (diff) | |
| download | gsoc2013-epiphany-0149582ef3d39e8e69c746e167a42356983b79d9.tar.gz gsoc2013-epiphany-0149582ef3d39e8e69c746e167a42356983b79d9.tar.zst gsoc2013-epiphany-0149582ef3d39e8e69c746e167a42356983b79d9.zip | |
Clean uneeded EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED
We now have ephy_embed_get_web_view, EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED plus
EPHY_WEB_VIEW casts are useless.
Bug #608749
| -rw-r--r-- | src/ephy-navigation-action.c | 7 | ||||
| -rw-r--r-- | src/ephy-shell.c | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 2 | ||||
| -rw-r--r-- | src/popup-commands.c | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index d3c31299b..c2ebce792 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -430,8 +430,11 @@ ephy_navigation_action_activate (GtkAction *gtk_action) web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed); webkit_web_view_load_uri (web_view, forward_uri); - } else - webkit_web_view_go_forward (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)); + } + else + { + webkit_web_view_go_forward (web_view); + } } else if (action->priv->direction == EPHY_NAVIGATION_DIRECTION_UP) { diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 3ae1a0b7a..e276731a8 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -397,7 +397,7 @@ load_homepage (EphyEmbed *embed) } is_empty = url_is_empty (home); - ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), home); + ephy_web_view_load_url (ephy_embed_get_web_view (embed), home); g_free (home); diff --git a/src/ephy-window.c b/src/ephy-window.c index bba3ef91b..714d5ce87 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -3604,7 +3604,7 @@ ephy_window_open_link (EphyLink *link, } else { - ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), address); + ephy_web_view_load_url (ephy_embed_get_web_view (embed), address); if (address == NULL || address[0] == '\0' || strcmp (address, "about:blank") == 0) { diff --git a/src/popup-commands.c b/src/popup-commands.c index 06280a45b..8930d834c 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -263,7 +263,7 @@ popup_cmd_open_link (GtkAction *action, event = ephy_window_get_context_event (window); ephy_embed_event_get_property (event, "link-uri", &value); location = g_value_get_string (&value); - ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), location); + ephy_web_view_load_url (ephy_embed_get_web_view (embed), location); g_value_unset (&value); } @@ -391,7 +391,7 @@ popup_cmd_open_frame (GtkAction *action, g_return_if_fail (embed != NULL); location = ephy_web_view_get_location (ephy_embed_get_web_view (embed), FALSE); - ephy_web_view_load_url (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), location); + ephy_web_view_load_url (ephy_embed_get_web_view (embed), location); g_free (location); } |