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, 5 insertions, 3 deletions

diff --git a/src/ephy-main.c b/src/ephy-main.c
index 0a0093974..becc1d2e5 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -23,12 +23,13 @@
 #include "ephy-shell.h"
 #include "ephy-automation.h"
 #include "ephy-window.h"
+#include "ephy-file-helpers.h"
 #include "EphyAutomation.h"
 
 #include <libbonoboui.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-window-icon.h>
+#include <gtk/gtkwindow.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <glade/glade-init.h>
 
@@ -147,10 +148,11 @@ main (int argc, char *argv[])
 
 		glade_gnome_init ();
 
-		gnome_window_icon_set_default_from_file (PIXMAP_DIR "/ephy.png");
-
 		ephy_shell_new ();
 
+		gtk_window_set_default_icon_from_file
+			(ephy_file ("epiphany.png"), NULL);
+
 		g_idle_add ((GSourceFunc) ephy_main_start, NULL);
 
 		bonobo_main ();