From bbda044fa543cce525dd4b585941ea2a6f1f249f Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 28 May 2003 15:43:24 +0000 Subject: continuing checkin of previous patch (cvs aborted "broken pipe") 2003-05-28 Christian Persch continuing checkin of previous patch (cvs aborted "broken pipe") --- embed/ephy-embed-single.h | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'embed/ephy-embed-single.h') diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h index ebd065a92..3d271842e 100644 --- a/embed/ephy-embed-single.h +++ b/embed/ephy-embed-single.h @@ -23,6 +23,7 @@ #include "ephy-favicon-cache.h" #include "ephy-history.h" #include "downloader-view.h" +#include "ephy-langs.h" #include #include @@ -82,12 +83,6 @@ typedef struct gchar *username; } PasswordInfo; -typedef struct -{ - const char *name; - const char *title; -} CharsetInfo; - /** * PasswordType: To distinguish actual passwords from blocked password sites */ @@ -134,11 +129,12 @@ struct EphyEmbedSingleClass const char* url); gresult (* show_java_console) (EphyEmbedSingle *shell); gresult (* show_js_console) (EphyEmbedSingle *shell); - gresult (* get_charset_groups) (EphyEmbedSingle *shell, + gresult (* get_language_groups) (EphyEmbedSingle *shell, GList **groups); - gresult (* get_charset_titles) (EphyEmbedSingle *shell, - const char *group, - GList **charsets); + gresult (* get_encodings) (EphyEmbedSingle *shell, + LanguageGroup group, + gboolean elide_underscores, + GList **encodings); gresult (* get_font_list) (EphyEmbedSingle *shell, const char *langGroup, const char *fontType, @@ -178,13 +174,14 @@ gresult ephy_embed_single_set_offline_mode (EphyEmbedSingle *shell, gresult ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell, const char* url); -/* Charsets */ -gresult ephy_embed_single_get_charset_groups (EphyEmbedSingle *shell, +/* Encodings */ +gresult ephy_embed_single_get_language_groups (EphyEmbedSingle *shell, GList **groups); -gresult ephy_embed_single_get_charset_titles (EphyEmbedSingle *shell, - const char *group, - GList **charsets); +gresult ephy_embed_single_get_encodings (EphyEmbedSingle *shell, + LanguageGroup group, + gboolean elide_underscores, + GList **encodings); gresult ephy_embed_single_get_font_list (EphyEmbedSingle *shell, const char *langGroup, -- cgit