diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
| commit | b774b547788b74884b9eb690c548a6016e714023 (patch) | |
| tree | 72b9df09c0fc257169b3e9b9cbdc349e56a63101 /src | |
| parent | b699b40d663955560655271f7645ae277e6076c8 (diff) | |
| download | gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.bz2 gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.lz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.xz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.zst gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.zip | |
merge mozilla-embed-strings branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-tab.c | 9 | ||||
| -rw-r--r-- | src/ephy-window.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 1ef36aae6..b7f2e1729 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -676,7 +676,11 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab) ephy_tab_set_link_message (tab, NULL); ephy_tab_set_icon_address (tab, NULL); ephy_tab_update_navigation_flags (tab, embed); +} +static void +ephy_tab_content_change_cb (EphyEmbed *embed, const char *address, EphyTab *tab) +{ /* restore zoom level */ if (address_has_web_scheme (address)) { @@ -700,7 +704,7 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab) if (zoom != current_zoom) { tab->priv->setting_zoom = TRUE; - ephy_embed_set_zoom (embed, zoom, FALSE); + ephy_embed_set_zoom (embed, zoom); tab->priv->setting_zoom = FALSE; } } @@ -1284,6 +1288,9 @@ ephy_tab_init (EphyTab *tab) g_signal_connect_object (embed, "ge_favicon", G_CALLBACK (ephy_tab_favicon_cb), tab, 0); + g_signal_connect_object (embed, "ge_content_change", + G_CALLBACK (ephy_tab_content_change_cb), + tab, 0); cache = EPHY_FAVICON_CACHE (ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell))); diff --git a/src/ephy-window.c b/src/ephy-window.c index 585e82cb4..cdb4b6281 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2584,7 +2584,7 @@ ephy_window_set_zoom (EphyWindow *window, if (zoom != current_zoom) { - ephy_embed_set_zoom (embed, zoom, TRUE); + ephy_embed_set_zoom (embed, zoom); } } |