diff options
| author | Xan Lopez <xan@src.gnome.org> | 2009-03-02 03:47:02 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2009-03-02 03:47:02 +0800 |
| commit | 47ad1005ec007fc15b2ed83d78101a9785688afe (patch) | |
| tree | b0805d4c7976a32d384c56b3144ff4569172e503 /src/ephy-encoding-dialog.c | |
| parent | 2594a1ecfee6163933953bfe9520fef351f13da1 (diff) | |
| download | gsoc2013-epiphany-47ad1005ec007fc15b2ed83d78101a9785688afe.tar.gz gsoc2013-epiphany-47ad1005ec007fc15b2ed83d78101a9785688afe.tar.zst gsoc2013-epiphany-47ad1005ec007fc15b2ed83d78101a9785688afe.zip | |
Use new get_encoding API to properly figure out automatic vs override encoding.
svn path=/trunk/; revision=8832
Diffstat (limited to 'src/ephy-encoding-dialog.c')
| -rw-r--r-- | src/ephy-encoding-dialog.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c index fcbd1ad4d..0556a8813 100644 --- a/src/ephy-encoding-dialog.c +++ b/src/ephy-encoding-dialog.c @@ -86,7 +86,7 @@ sync_encoding_against_embed (EphyEncodingDialog *dialog) GList *rows; GtkWidget *button; const char *encoding; - gboolean is_automatic; + gboolean is_automatic = FALSE; WebKitWebView *view; dialog->priv->update_tag = TRUE; @@ -96,7 +96,12 @@ sync_encoding_against_embed (EphyEncodingDialog *dialog) view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed); encoding = webkit_web_view_get_custom_encoding (view); - if (encoding == NULL) return; + if (encoding == NULL) + { + encoding = webkit_web_view_get_encoding (view); + if (encoding == NULL) return; + is_automatic = TRUE; + } node = ephy_encodings_get_node (dialog->priv->encodings, encoding, TRUE); g_assert (EPHY_IS_NODE (node)); |