From 7093f6ad148d62a9ddc77f8080cf9822d5d24f1f Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 1 May 2004 20:47:00 +0000 Subject: Clean up encoding handling. 2004-05-01 Christian Persch * embed/ephy-embed.c: (ephy_embed_get_encoding), (ephy_embed_has_automatic_encoding): * embed/ephy-embed.h: * embed/ephy-encodings.c: * embed/ephy-encodings.h: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyBrowser.h: * embed/mozilla/MozRegisterComponents.cpp: * embed/mozilla/mozilla-embed.cpp: * src/ephy-encoding-dialog.c: (sync_embed_cb), (activate_choice): * src/ephy-encoding-menu.c: (update_encoding_menu_cb), (encoding_activate_cb): Clean up encoding handling. --- embed/ephy-embed.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'embed/ephy-embed.c') diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index c38d8b5ce..1b38cda13 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -672,16 +672,29 @@ ephy_embed_set_encoding (EphyEmbed *embed, } /** - * ephy_embed_get_encoding_info: + * ephy_embed_get_encoding: * @embed: an #EphyEmbed * - * Returns @embed's #EphyEncodingInfo. + * Returns the @embed's document's encoding **/ -EphyEncodingInfo * -ephy_embed_get_encoding_info (EphyEmbed *embed) +char * +ephy_embed_get_encoding (EphyEmbed *embed) +{ + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); + return iface->get_encoding (embed); +} + +/** + * ephy_embed_has_automatic_encoding: + * @embed: an #EphyEmbed + * + * Returns whether the @embed's document's was determined by the document itself + **/ +gboolean +ephy_embed_has_automatic_encoding (EphyEmbed *embed) { EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - return iface->get_encoding_info (embed); + return iface->has_automatic_encoding (embed); } /** -- cgit v1.2.3