From 442741fc4fb9b63c78c37f305d443f8aa57ff67e Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 13 Oct 2003 17:38:16 +0000 Subject: Encodings menu improvements, part 3: Refactored the encodings list; it no 2003-10-13 Christian Persch * embed/ephy-embed-single.c: (ephy_embed_single_free_passwords): * embed/ephy-embed-single.h: * embed/ephy-embed-utils.c: (ephy_embed_utils_build_encodings_submenu): * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-notifiers.cpp: * lib/Makefile.am: * lib/ephy-encodings.c: (ephy_encoding_info_free), (encodings_info_cmp), (ephy_encodings_get_list): * lib/ephy-encodings.h: * lib/ephy-langs.c: (ephy_lang_group_info_free), (lang_group_info_cmp), (ephy_lang_get_group_list), (fonts_language_info_cmp), (ephy_font_langs_get_codes_list), (ephy_font_langs_get_list): * lib/ephy-langs.h: * po/POTFILES.in: * src/ephy-encoding-menu.c: (ephy_encoding_menu_set_window), (ephy_encoding_menu_rebuild): * src/prefs-dialog.c: (prefs_dialog_finalize), (get_current_language_code), (create_fonts_language_menu), (default_encoding_menu_changed_cb), (find_encoding_in_list_cmp), (create_default_encoding_menu): Encodings menu improvements, part 3: Refactored the encodings list; it no longer is neccessary to have it in the embed single. Ported all callers to new infrastructure. --- embed/ephy-embed-single.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'embed/ephy-embed-single.c') diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 83c60026a..d09377552 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -18,7 +18,9 @@ * $Id$ */ -#include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "ephy-embed-shell.h" #include "ephy-marshal.h" @@ -35,7 +37,6 @@ enum LAST_SIGNAL }; - #define EPHY_EMBED_SINGLE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSinglePrivate)) struct EphyEmbedSinglePrivate @@ -138,24 +139,6 @@ ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell, return klass->load_proxy_autoconf (shell, url); } -gresult -ephy_embed_single_get_encodings (EphyEmbedSingle *shell, - LanguageGroup group, - gboolean elide_underscores, - GList **encodings) -{ - EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->get_encodings (shell, group, elide_underscores, encodings); -} - -gresult -ephy_embed_single_get_language_groups (EphyEmbedSingle *shell, - GList **groups) -{ - EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->get_language_groups (shell, groups); -} - gresult ephy_embed_single_get_font_list (EphyEmbedSingle *shell, const char *langGroup, @@ -277,4 +260,3 @@ ephy_embed_single_free_passwords (EphyEmbedSingle *shell, return G_OK; } - -- cgit v1.2.3