Make GaleonShell inherit from GaleonEmbedShell. Ref the shell when using

2003-01-05  Marco Pesenti Gritti  <marco@it.gnome.org>

	* data/art/Makefile.am:
	* data/art/epiphany.png:
	* data/epiphany.schemas.in:
	* data/glade/epiphany.glade:
	* embed/downloader-view.c: (downloader_view_init),
	(downloader_view_finalize):
	* embed/ephy-embed-favicon.c: (ephy_embed_favicon_set_property):
	* embed/ephy-embed-shell.c: (ephy_embed_shell_get_impl),
	(ephy_embed_shell_get_type), (ephy_embed_shell_new):
	* embed/ephy-embed-shell.h:
	* embed/ephy-embed-utils.c:
	(ephy_embed_utils_build_charsets_submenu):
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* src/appearance-prefs.c: (setup_font_menu):
	* src/bookmarks/ephy-bookmarks.c: (compute_lower_fav),
	(ephy_setup_history_notifiers):
	* src/ephy-main.c: (main):
	* src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init):
	* src/ephy-shell.c: (ephy_shell_get_type), (ephy_shell_init),
	(ephy_shell_finalize), (build_homepage_url),
	(ephy_shell_get_autocompletion):
	* src/ephy-shell.h:
	* src/ephy-tab.c: (ephy_tab_init), (ephy_tab_location_cb),
	(ephy_tab_visibility_cb):
	* src/ephy-window.c: (favicon_cache_changed_cb),
	(ephy_window_init), (update_favicon_control):
	* src/general-prefs.c: (create_default_charset_menu):
	* src/history-dialog.c: (history_dialog_init):
	* src/pdm-dialog.c: (pdm_dialog_cookie_remove),
	(pdm_dialog_password_remove), (pdm_dialog_cookies_free),
	(pdm_dialog_passwords_free), (pdm_dialog_init):
	* src/prefs-dialog.c: (prefs_clear_memory_cache_button_clicked_cb),
	(prefs_clear_disk_cache_button_clicked_cb):
	* src/window-commands.c: (window_cmd_file_open):

	Make GaleonShell inherit from GaleonEmbedShell.
	Ref the shell when using the downloader.
	Use favicons for the window icon when possible.
	This required to use jimmac icon as default,
	we still dont have his permission, I'll remove it
	later if necessary.

1 files changed, 9 insertions, 33 deletions

diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index d408a7652..491b01b5f 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -45,7 +45,6 @@
 
 struct EphyShellPrivate
 {
-	EphyEmbedShell *embed_shell;
 	Session *session;
 	EphyAutocompletion *autocompletion;
 	EphyBookmarks *bookmarks;
@@ -102,9 +101,9 @@ ephy_shell_get_type (void)
                         (GInstanceInitFunc) ephy_shell_init
                 };
 
-                ephy_shell_type = g_type_register_static (G_TYPE_OBJECT,
-							    "EphyShell",
-							    &our_info, 0);
+                ephy_shell_type = g_type_register_static (EPHY_EMBED_SHELL_IMPL,
+							  "EphyShell",
+							  &our_info, 0);
         }
 
         return ephy_shell_type;
@@ -169,11 +168,7 @@ ephy_shell_init (EphyShell *gs)
 	gs->priv->session = NULL;
 	gs->priv->bookmarks = NULL;
 
-	gs->priv->embed_shell = ephy_embed_shell_new ("mozilla");
-
-	g_assert (gs->priv->embed_shell != NULL);
-
-	g_signal_connect (G_OBJECT(embed_shell),
+	g_signal_connect (G_OBJECT (gs),
 			  "new_window_orphan",
 			  G_CALLBACK(ephy_shell_new_window_cb),
 			  NULL);
@@ -195,9 +190,6 @@ ephy_shell_finalize (GObject *object)
 
 	g_assert (ephy_shell == NULL);
 
-	g_return_if_fail (IS_EPHY_EMBED_SHELL (gs->priv->embed_shell));
-	g_object_unref (G_OBJECT (gs->priv->embed_shell));
-
 	if (gs->priv->session)
 	{
 		g_return_if_fail (IS_SESSION(gs->priv->session));
@@ -217,12 +209,12 @@ ephy_shell_finalize (GObject *object)
 		g_object_unref (gs->priv->bookmarks);
 	}
 
-	ephy_file_helpers_shutdown ();
-	ephy_node_system_shutdown ();
+        G_OBJECT_CLASS (parent_class)->finalize (object);
 
         g_free (gs->priv);
 
-        G_OBJECT_CLASS (parent_class)->finalize (object);
+	ephy_file_helpers_shutdown ();
+	ephy_node_system_shutdown ();
 
 #ifdef DEBUG_MARCO
 	g_print ("Ephy shell finalized\n");
@@ -241,22 +233,6 @@ ephy_shell_new (void)
 	return EPHY_SHELL (g_object_new (EPHY_SHELL_TYPE, NULL));
 }
 
-/**
- * ephy_shell_get_embed_shell:
- * @gs: a #EphyShell
- *
- * Returns the embed shell created by the #EphyShell
- *
- * Return value: the embed shell
- **/
-EphyEmbedShell *
-ephy_shell_get_embed_shell (EphyShell *gs)
-{
-	g_return_val_if_fail (IS_EPHY_SHELL (gs), NULL);
-
-	return gs->priv->embed_shell;
-}
-
 static void
 ephy_init_services (EphyShell *gs)
 {
@@ -312,7 +288,7 @@ build_homepage_url (EphyShell *gs,
 		{
 			/* get location of last page */
 			gh = ephy_embed_shell_get_global_history
-				(gs->priv->embed_shell);
+				(EPHY_EMBED_SHELL (gs));
 			last_page_url = ephy_history_get_last_page (gh);
 			result = g_strdup (last_page_url);
 		}
@@ -495,7 +471,7 @@ ephy_shell_get_autocompletion (EphyShell *gs)
 			NULL
 		};
 
-		EphyHistory *gh = ephy_embed_shell_get_global_history (gs->priv->embed_shell);
+		EphyHistory *gh = ephy_embed_shell_get_global_history (EPHY_EMBED_SHELL (gs));
 		EphyFilesystemAutocompletion *fa = ephy_filesystem_autocompletion_new ();
 		p->autocompletion = ephy_autocompletion_new ();
 		ephy_autocompletion_set_prefixes (p->autocompletion, prefixes);