Use a define for the default window icon. Bug #385872.

2006-12-15  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/GeckoPrintService.cpp:
	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
	* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
	* lib/ephy-file-chooser.c: (ephy_file_chooser_constructor):
	* lib/ephy-gui.c: (ephy_gui_check_location_writable):
	* lib/ephy-module.c:
	* lib/ephy-password-dialog.c: (ephy_password_dialog_constructor):
	* lib/ephy-spell-check.c:
	* lib/ephy-stock-icons.h:
	* lib/widgets/.cvsignore:
	* lib/widgets/ephy-spinner-tool-item.c:
	(ephy_spinner_tool_item_toolbar_reconfigured):
	* lib/widgets/testspinner.c:
	* plugins/desktop-file/plugin.cpp:
	* src/bookmarks/ephy-bookmarks.c: (redirect_cb):
	* src/ephy-history-window.c: (confirmation_dialog_construct):
	* src/ephy-main.c: (main):
	* src/ephy-session.c: (confirm_shutdown_cb),
	(session_command_autoresume):
	* src/ephy-shell.c: (ephy_shell_add_sidebar_cb):
	* src/ephy-toolbar-editor.c: (ephy_toolbar_editor_constructor):
	* src/ephy-window.c: (construct_confirm_close_dialog):
	* src/pdm-dialog.c: (pdm_dialog_init):
	* src/window-commands.c: (window_cmd_help_about):

	Use a define for the default window icon. Bug #385872.

        * lib/ephy-module.c:

	The symbol can be NULL even though the symbol lookup succeeded.

10 files changed, 17 insertions, 11 deletions

diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 89341ae70..9196a271c 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -36,6 +36,7 @@
 #include "ephy-prefs.h"
 #include "ephy-marshal.h"
 #include "ephy-signal-accumulator.h"
+#include "ephy-stock-icons.h"
 
 #include "eel-gconf-extensions.h"
 
@@ -496,7 +497,7 @@ redirect_cb (EphyHistory *history,
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Update Bookmark?"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	g_object_set_data_full (G_OBJECT (dialog), UPDATE_URI_DATA_KEY,
 				g_strdup (to_uri), (GDestroyNotify) g_free);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 3f3c1d9af..88fe946fe 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -272,7 +272,7 @@ confirmation_dialog_construct (EphyHistoryWindow *editor)
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Clear History"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (confirmation_dialog_response_cb),
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 396942b8f..3ad0b84ed 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -611,7 +611,7 @@ main (int argc,
 	g_set_application_name (_("Web Browser"));
 
 	/* Set default window icon */
-	gtk_window_set_default_icon_name ("web-browser");
+	gtk_window_set_default_icon_name (EPHY_STOCK_EPHY);
 
 	startup_error_quark = g_quark_from_static_string ("epiphany-startup-error");
 
diff --git a/src/ephy-session.c b/src/ephy-session.c
index ef46e02a2..1214d9e07 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -34,6 +34,7 @@
 #include "ephy-prefs.h"
 #include "ephy-gui.h"
 #include "ephy-debug.h"
+#include "ephy-stock-icons.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
@@ -282,7 +283,7 @@ confirm_shutdown_cb (GnomeClient *client,
 			       _("_Abort Downloads"), GTK_RESPONSE_ACCEPT);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), "");
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
 
@@ -617,7 +618,7 @@ session_command_autoresume (EphySession *session,
 			       _("_Recover"), GTK_RESPONSE_ACCEPT);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Crash Recovery"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index e6a3ecf8a..1d87daedb 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -52,6 +52,7 @@
 #include "ephy-toolbar.h"
 #include "ephy-prefs.h"
 #include "ephy-gui.h"
+#include "ephy-stock-icons.h"
 
 #ifdef ENABLE_NETWORK_MANAGER
 #include "ephy-net-monitor.h"
@@ -199,7 +200,7 @@ ephy_shell_add_sidebar_cb (EphyEmbedSingle *embed_single,
 					 _("Sidebar extension required"));
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Sidebar Extension Required"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 		  _("The link you clicked needs the sidebar extension to be "
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
index c95cfb836..db3dc3031 100644
--- a/src/ephy-toolbar-editor.c
+++ b/src/ephy-toolbar-editor.c
@@ -32,6 +32,7 @@
 #include "egg-editable-toolbar.h"
 #include "egg-toolbar-editor.h"
 #include "eel-gconf-extensions.h"
+#include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
@@ -199,7 +200,7 @@ ephy_toolbar_editor_constructor (GType type,
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor"));
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->window));
 	gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (priv->window)),
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index a4c4bd8b7..fb189e774 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -560,7 +560,7 @@ ephy_toolbar_constructor (GType type,
 	gtoolbar = GTK_TOOLBAR (priv->fixed_toolbar);
 	gtk_toolbar_set_show_arrow (gtoolbar, FALSE);
 
-	priv->spinner = ephy_spinner_tool_item_new ();
+	priv->spinner = EPHY_SPINNER_TOOL_ITEM (ephy_spinner_tool_item_new ());
 	gtk_toolbar_insert (gtoolbar, GTK_TOOL_ITEM (priv->spinner), -1);
 	gtk_widget_show (GTK_WIDGET (priv->spinner));
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 4d7709688..9d626cb1a 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -756,7 +756,7 @@ construct_confirm_close_dialog (EphyWindow *window)
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
 	/* FIXME gtk_window_set_title (GTK_WINDOW (dialog), _("Close Document?")); */
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	gtk_window_group_add_window (GTK_WINDOW (window)->group, GTK_WINDOW (dialog));
 
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index b3052f8d2..006d252be 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -30,6 +30,7 @@
 #include "ephy-gui.h"
 #include "ephy-state.h"
 #include "ephy-string.h"
+#include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 
 #include <gtk/gtklabel.h>
@@ -1205,7 +1206,7 @@ pdm_dialog_init (PdmDialog *dialog)
 
 	ephy_gui_ensure_window_group (GTK_WINDOW (window));
 
-	gtk_window_set_icon_name (GTK_WINDOW (window), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (window), EPHY_STOCK_EPHY);
 
 	g_signal_connect (window, "response",
 			  G_CALLBACK (pdm_dialog_response_cb), dialog);
diff --git a/src/window-commands.c b/src/window-commands.c
index 97f15d709..318f584f3 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -46,6 +46,7 @@
 #include "ephy-location-entry.h"
 #include "ephy-bookmarks-ui.h"
 #include "ephy-link.h"
+#include "ephy-stock-icons.h"
 #include "pdm-dialog.h"
 
 #include <string.h>
@@ -801,7 +802,7 @@ window_cmd_help_about (GtkAction *action,
 				 * line seperated by newlines (\n).
 				 */
 			       "translator-credits", _("translator-credits"),
-			       "logo-icon-name", "web-browser",
+			       "logo-icon-name", EPHY_STOCK_EPHY,
 			       "website", "http://www.gnome.org/projects/epiphany",
 			       "website-label", _("GNOME Web Browser Website"),
 			       "license", licence,