Encodings menu improvements, part 3: Refactored the encodings list; it no

2003-10-13  Christian Persch  <chpe@cvs.gnome.org>

	* 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.

1 files changed, 11 insertions, 21 deletions

diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index 274d5a8a7..c4007dd73 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -46,38 +46,28 @@ typedef enum
 	LG_WESTERN,
 	LG_OTHER,
 	LG_ALL
-} LanguageGroup;
+} EphyLanguageGroup;
 
 typedef struct
 {
-	gchar *title;
-	gchar *key;
-	LanguageGroup group;
-} LanguageGroupInfo;
+	EphyLanguageGroup group;
+	char *title;
+	char *key;
+} EphyLanguageGroupInfo;
 
 typedef struct
 {
-	gchar *title;
-	gchar *key;
-	gchar *encoding;
-	LanguageGroup group;
-} EncodingInfo;
-
-/* language encoding groups */
-typedef struct
-{
-	gchar *title;
-	gchar* code;
+	char *title;
+	char *code;
 } FontsLanguageInfo;
 
-guint			 ephy_langs_get_n_font_languages (void);
-
-const FontsLanguageInfo *ephy_langs_get_font_languages   (void);
+GList	*ephy_font_langs_get_list	(void);
 
-void			 language_group_info_free	 (LanguageGroupInfo *info);
+GList	*ephy_font_langs_get_codes_list	(void);
 
-void			 encoding_info_free		 (EncodingInfo *info);
+GList	*ephy_lang_get_group_list	(void);
 
+void	 ephy_lang_group_info_free	(EphyLanguageGroupInfo *info);
 
 G_END_DECLS