Encoding menu improvements, Part 4: The Rewrite.

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

	Encoding menu improvements, Part 4:
	The Rewrite.

	* data/glade/epiphany.glade:
	* data/ui/epiphany-ui.xml:
	* data/ui/nautilus-epiphany-view.xml.in:
	* embed/Makefile.am:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_init),
	(ephy_embed_shell_finalize), (ephy_embed_shell_new),
	(ephy_embed_shell_get_encodings):
	* embed/ephy-embed-shell.h:
	* embed/ephy-embed-utils.c: (ephy_embed_utils_save):
	* embed/ephy-embed-utils.h:
	* embed/ephy-embed.c: (ephy_embed_get_encoding_info):
	* embed/ephy-embed.h:
	* embed/ephy-encodings.c: (ephy_encodings_get_type),
	(ephy_encodings_finalize), (ephy_encodings_class_init),
	(ephy_encodings_get_node), (ephy_encodings_get_encodings),
	(ephy_encodings_get_detectors), (ephy_encodings_get_all),
	(ephy_encodings_get_categories), (ephy_encodings_add_recent),
	(ephy_encodings_get_recent), (ephy_encodings_init),
	(ephy_encoding_info_free), (ephy_encodings_new):
	* embed/ephy-encodings.h:
	* embed/mozilla/EphyWrapper.cpp:
	* embed/mozilla/EphyWrapper.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* lib/Makefile.am:
	* lib/ephy-encodings.c:
	* lib/ephy-encodings.h:
	* lib/ephy-langs.c: (ephy_font_languages), (ephy_font_n_languages):
	* lib/ephy-langs.h:
	* src/Makefile.am:
	* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_get_type),
	(setup_filter), (sync_embed_cb), (sync_active_tab),
	(ephy_encoding_dialog_set_window), (activate_choice),
	(activate_automatic), (ephy_encoding_dialog_response_cb),
	(category_node_selected_cb), (view_node_selected_cb),
	(view_node_activated_cb), (ephy_encoding_dialog_init),
	(ephy_encoding_dialog_finalize),
	(ephy_encoding_dialog_set_property),
	(ephy_encoding_dialog_get_property),
	(ephy_encoding_dialog_class_init), (ephy_encoding_dialog_new):
	* src/ephy-encoding-dialog.h:
	* src/ephy-encoding-menu.c: (ephy_encoding_menu_init),
	(sort_encodings), (add_menu_item), (update_encoding_menu_cb),
	(encoding_activate_cb), (add_action),
	(ephy_encoding_menu_view_dialog_cb),
	(ephy_encoding_menu_automatic_cb), (ephy_encoding_menu_set_window),
	(ephy_encoding_menu_finalize), (ephy_encoding_menu_class_init),
	(ephy_encoding_menu_new):
	* src/ephy-nautilus-view.c: (gnv_bonobo_control_activate_cb),
	(gnv_cmd_select_encoding), (gnv_cmd_edit_find):
	* src/ephy-window.c: (ephy_window_set_active_tab),
	(setup_notebook), (ephy_window_set_property),
	(ephy_window_get_property), (ephy_window_class_init):
	* src/language-editor.h:
	* src/pdm-dialog.c: (setup_passwords_treeview),
	(setup_cookies_treeview):
	* src/prefs-dialog.c: (prefs_dialog_finalize),
	(get_current_language_code), (fonts_language_info_cmp),
	(create_fonts_language_menu), (find_encoding_in_list_cmp),
	(sort_encodings), (create_optionmenu), (prefs_dialog_init):

	Made encodings menu dynamic, containing recently used items + items
	related to the currently active encoding. Split encodings out as a
	embed shell service, port all users over to that. Harvest all encoding
	info we can get from mozilla.

1 files changed, 20 insertions, 8 deletions

diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index bcf9c0d00..0a0dbeb04 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -25,6 +25,7 @@
 #include "ephy-favicon-cache.h"
 #include "mozilla-embed-single.h"
 #include "downloader-view.h"
+#include "ephy-encodings.h"
 #include "ephy-debug.h"
 
 #include <string.h>
@@ -37,6 +38,7 @@ struct EphyEmbedShellPrivate
 	DownloaderView *downloader_view;
 	EphyFaviconCache *favicon_cache;
 	EphyEmbedSingle *embed_single;
+	EphyEncodings *encodings;
 };
 
 static void
@@ -109,6 +111,7 @@ ephy_embed_shell_init (EphyEmbedShell *ges)
 	ges->priv->global_history = NULL;
 	ges->priv->downloader_view = NULL;
 	ges->priv->favicon_cache = NULL;
+	ges->priv->encodings = NULL;
 }
 
 static void
@@ -137,6 +140,12 @@ ephy_embed_shell_finalize (GObject *object)
 		g_object_unref (G_OBJECT (ges->priv->favicon_cache));
 	}
 
+	LOG ("Unref encodings")
+	if (ges->priv->encodings)
+	{
+		g_object_unref (G_OBJECT (ges->priv->encodings));
+	}
+
 	LOG ("Unref embed single")
 	if (ges->priv->embed_single)
 	{
@@ -149,14 +158,7 @@ ephy_embed_shell_finalize (GObject *object)
 EphyEmbedShell *
 ephy_embed_shell_new (const char *type)
 {
-	if (strcmp (type, "mozilla") == 0)
-	{
-		return EPHY_EMBED_SHELL (g_object_new
-			(EPHY_TYPE_EMBED_SHELL, NULL));
-	}
-
-	g_assert_not_reached ();
-	return NULL;
+	return g_object_new (EPHY_TYPE_EMBED_SHELL, NULL);
 }
 
 /**
@@ -243,3 +245,13 @@ impl_get_downloader_view (EphyEmbedShell *shell)
 	return G_OBJECT (shell->priv->downloader_view);
 }
 
+GObject *
+ephy_embed_shell_get_encodings (EphyEmbedShell *shell)
+{
+	if (shell->priv->encodings == NULL)
+	{
+		shell->priv->encodings = ephy_encodings_new ();
+	}
+
+	return G_OBJECT (shell->priv->encodings);
+}