diff options
| author | Xan Lopez <xan@igalia.com> | 2013-03-25 22:52:46 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2013-03-26 01:07:40 +0800 |
| commit | ca3dd7cb33fb3a56a75884ee32a991a771f6f4cc (patch) | |
| tree | d679aa44ea71b2b94944d3fd70aa369652cf0154 | |
| parent | b8c5d5e6d8ffc4aa382be11953f3419a544f32c8 (diff) | |
| download | gsoc2013-epiphany-ca3dd7cb33fb3a56a75884ee32a991a771f6f4cc.tar.gz gsoc2013-epiphany-ca3dd7cb33fb3a56a75884ee32a991a771f6f4cc.tar.zst gsoc2013-epiphany-ca3dd7cb33fb3a56a75884ee32a991a771f6f4cc.zip | |
ephy-encoding-dialog: make this work again
We were not resetting correctly the internal state when getting a NULL
encoding from WebKit, so the dialog would stop working after that.
https://bugzilla.gnome.org/show_bug.cgi?id=696548
| -rw-r--r-- | src/ephy-encoding-dialog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c index de15cbae3..0e56cd2e7 100644 --- a/src/ephy-encoding-dialog.c +++ b/src/ephy-encoding-dialog.c @@ -119,13 +119,13 @@ sync_encoding_against_embed (EphyEncodingDialog *dialog) view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed); #ifdef HAVE_WEBKIT2 encoding = webkit_web_view_get_custom_charset (view); - if (encoding == NULL) return; + if (encoding == NULL) goto out; #else encoding = webkit_web_view_get_custom_encoding (view); if (encoding == NULL) { encoding = webkit_web_view_get_encoding (view); - if (encoding == NULL) return; + if (encoding == NULL) goto out; is_automatic = TRUE; } #endif @@ -156,7 +156,7 @@ sync_encoding_against_embed (EphyEncodingDialog *dialog) button = ephy_dialog_get_control (EPHY_DIALOG (dialog), "automatic_button"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), is_automatic); - +out: dialog->priv->update_tag = FALSE; } |