diff options
-rw-r--r-- | doc/reference/epiphany-sections.txt | 2 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 21 | ||||
-rw-r--r-- | embed/ephy-embed.c | 35 | ||||
-rw-r--r-- | embed/ephy-embed.h | 9 | ||||
-rw-r--r-- | embed/webkit/webkit-embed.c | 19 | ||||
-rw-r--r-- | src/ephy-window.c | 7 | ||||
-rw-r--r-- | src/epiphany.defs | 15 |
7 files changed, 5 insertions, 103 deletions
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt index f9ce0b6a7..fe8a9e580 100644 --- a/doc/reference/epiphany-sections.txt +++ b/doc/reference/epiphany-sections.txt @@ -76,8 +76,6 @@ ephy_embed_shistory_get_nth ephy_embed_shistory_get_pos ephy_embed_shistory_go_nth ephy_embed_get_security_level -ephy_embed_set_zoom -ephy_embed_get_zoom ephy_embed_find_set_properties ephy_embed_find_next ephy_embed_set_encoding diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index 5fb26aed8..268c8fa23 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -272,7 +272,6 @@ be done by casting). @dom_mouse_down: @dom_content_loaded: @popup_blocked: -@zoom_change: @content_blocked: @modal_alert: @modal_alert_closed: @@ -293,8 +292,6 @@ be done by casting). @shistory_copy: @get_security_level: @show_page_certificate: -@set_zoom: -@get_zoom: @scroll_lines: @scroll_pages: @scroll_pixels: @@ -417,24 +414,6 @@ windows opened with JavaScript often use a nonstandard chrome. @description: -<!-- ##### FUNCTION ephy_embed_set_zoom ##### --> -<para> - -</para> - -@embed: -@zoom: - - -<!-- ##### FUNCTION ephy_embed_get_zoom ##### --> -<para> - -</para> - -@embed: -@Returns: - - <!-- ##### FUNCTION ephy_embed_find_set_properties ##### --> <para> diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 2260b112d..71db600b2 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -504,41 +504,6 @@ ephy_embed_get_js_status (EphyEmbed *embed) } /** - * ephy_embed_set_zoom: - * @embed: an #EphyEmbed - * @zoom: the new zoom level - * - * Sets the zoom level for a web page. - * - * Zoom is normally controlled by the Epiphany itself and remembered in - * Epiphany's history data. Be very careful not to break this behavior if using - * this function; better yet, don't use this function at all. - **/ -void -ephy_embed_set_zoom (EphyEmbed *embed, - float zoom) -{ - EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - iface->set_zoom (embed, zoom); -} - -/** - * ephy_embed_get_zoom: - * @embed: an #EphyEmbed - * - * Returns the zoom level of @embed. A zoom of 1.0 corresponds to 100% (normal - * size). - * - * Return value: the zoom level of @embed - **/ -float -ephy_embed_get_zoom (EphyEmbed *embed) -{ - EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - return iface->get_zoom (embed); -} - -/** * ephy_embed_scroll: * @embed: an #EphyEmbed * @num_lines: The number of lines to scroll by diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index 8a03b501b..b419cea96 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -184,9 +184,6 @@ struct _EphyEmbedIface EphyEmbedSecurityLevel *level, char **description); void (* show_page_certificate) (EphyEmbed *embed); - void (* set_zoom) (EphyEmbed *embed, - float zoom); - float (* get_zoom) (EphyEmbed *embed); void (* scroll_lines) (EphyEmbed *embed, int num_lines); void (* scroll_pages) (EphyEmbed *embed, @@ -270,12 +267,6 @@ void ephy_embed_get_security_level (EphyEmbed *embed, void ephy_embed_show_page_certificate (EphyEmbed *embed); -/* Zoom */ -void ephy_embed_set_zoom (EphyEmbed *embed, - float zoom); - -float ephy_embed_get_zoom (EphyEmbed *embed); - /* Scroll */ void ephy_embed_scroll (EphyEmbed *embed, int num_lines); diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c index 4d483844a..ec9ceefb2 100644 --- a/embed/webkit/webkit-embed.c +++ b/embed/webkit/webkit-embed.c @@ -383,23 +383,6 @@ impl_get_location (EphyEmbed *embed, return g_strdup (webkit_web_frame_get_uri (web_frame)); } -static float -impl_get_zoom (EphyEmbed *embed) -{ - float zoom = 1.0f; - g_object_get (WEBKIT_EMBED (embed)->priv->web_view, "zoom-level", &zoom, NULL); - return zoom; -} - -static void -impl_set_zoom (EphyEmbed *embed, - float zoom) -{ - g_return_if_fail (zoom > 0.0); - - g_object_set (WEBKIT_EMBED (embed)->priv->web_view, "zoom-level", zoom, NULL); -} - static void impl_scroll_lines (EphyEmbed *embed, int num_lines) @@ -502,8 +485,6 @@ ephy_embed_iface_init (EphyEmbedIface *iface) iface->go_up = impl_go_up; iface->get_location = impl_get_location; iface->get_js_status = impl_get_js_status; - iface->set_zoom = impl_set_zoom; - iface->get_zoom = impl_get_zoom; iface->scroll_lines = impl_scroll_lines; iface->scroll_pages = impl_scroll_pages; iface->scroll_pixels = impl_scroll_pixels; diff --git a/src/ephy-window.c b/src/ephy-window.c index 52c19603c..ad31d1682 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -3753,13 +3753,16 @@ ephy_window_set_zoom (EphyWindow *window, { EphyEmbed *embed; float current_zoom = 1.0; + WebKitWebView *web_view; g_return_if_fail (EPHY_IS_WINDOW (window)); embed = window->priv->active_embed; g_return_if_fail (embed != NULL); - current_zoom = ephy_embed_get_zoom (embed); + web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed); + + g_object_get (G_OBJECT (web_view), "zoom-level", ¤t_zoom, NULL); if (zoom == ZOOM_IN) { @@ -3772,7 +3775,7 @@ ephy_window_set_zoom (EphyWindow *window, if (zoom != current_zoom) { - ephy_embed_set_zoom (embed, zoom); + g_object_set (G_OBJECT (web_view), "zoom-level", zoom, NULL); } } diff --git a/src/epiphany.defs b/src/epiphany.defs index 682dc8c54..133440830 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -1066,12 +1066,6 @@ ) ) -(define-method get_zoom - (of-object "EphyEmbed") - (c-name "ephy_embed_get_zoom") - (return-type "float") -) - (define-method get_document_type (of-object "EphyEmbed") (c-name "ephy_embed_get_document_type") @@ -1174,15 +1168,6 @@ (return-type "none") ) -(define-method set_zoom - (of-object "EphyEmbed") - (c-name "ephy_embed_set_zoom") - (return-type "none") - (parameters - '("float" "zoom") - ) -) - (define-method has_automatic_encoding (of-object "EphyEmbed") (c-name "ephy_embed_has_automatic_encoding") |