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.

7 files changed, 21 insertions, 14 deletions

diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 3e743c40c..4cc5d7f30 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -418,6 +418,7 @@ void
 ephy_embed_load_url (EphyEmbed *embed,
 		     const char *url)
 {
+	/* Remove that crap patch please */
 	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
 	iface->load_url (embed, url);
 }
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 2948514eb..7815b5da8 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -327,7 +327,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       action_label, mAction);
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
  
 	int defaultResponse = mAction == CONTENT_ACTION_NONE
 				? (int) GTK_RESPONSE_CANCEL
diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp
index 5a4ca358f..59a9c3734 100644
--- a/embed/mozilla/GeckoPrintService.cpp
+++ b/embed/mozilla/GeckoPrintService.cpp
@@ -44,6 +44,7 @@
 #include "ephy-file-helpers.h"
 #include "ephy-gui.h"
 #include "ephy-prefs.h"
+#include "ephy-stock-icons.h"
 
 #include "AutoJSContextStack.h"
 #include "AutoWindowModalState.h"
@@ -174,7 +175,7 @@ GeckoPrintService::ShowPrintDialog (nsIDOMWindow *aParent,
   g_object_unref (custom_tab);
   g_object_unref (xml);
 
-  gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
   int response = gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_hide (dialog);
@@ -422,7 +423,7 @@ GeckoPrintService::PrintUnattended (nsIDOMWindow *aParent,
 				     "%s", _("Preparing to print"));
   }
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
-  gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
   gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
   FindPrinterData *data = g_new0 (PrinterData, 1);
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 54590deea..285d8bdcc 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -55,6 +55,7 @@
 #include "ephy-debug.h"
 #include "ephy-gui.h"
 #include "ephy-state.h"
+#include "ephy-stock-icons.h"
 
 #include "AutoJSContextStack.h"
 #include "AutoWindowModalState.h"
@@ -170,7 +171,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
 					     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_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index ddf14848f..d7c5df20b 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -86,6 +86,7 @@
 #include "ephy-file-helpers.h"
 #include "ephy-gui.h"
 #include "ephy-password-dialog.h"
+#include "ephy-stock-icons.h"
 
 #include "AutoJSContextStack.h"
 #include "AutoWindowModalState.h"
@@ -253,7 +254,7 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx,
 	}
 
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	higgy_setup_dialog (GTK_DIALOG (dialog), 
 			    GTK_STOCK_DIALOG_WARNING, &label, &vbox);
@@ -591,7 +592,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
 			   "needs to be updated.\n\n"
 			   "Please ask your system administrator for assistance."),
 			 NS_ConvertUTF16toUTF8 (commonName).get ());
-	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",
 			  (GCallback) gtk_widget_destroy, NULL);
@@ -633,7 +634,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
 					     GTK_WINDOW (dialog));
 	}
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	higgy_setup_dialog (GTK_DIALOG (dialog), GTK_STOCK_DIALOG_WARNING,
 			    &label, NULL);
@@ -714,7 +715,7 @@ GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx)
 					     GTK_WINDOW (dialog));
 	}
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	higgy_setup_dialog (GTK_DIALOG (dialog), GTK_STOCK_DIALOG_ERROR,
 			    &label, NULL);
@@ -882,7 +883,7 @@ GtkNSSDialogs::CrlImportStatusDialog(nsIInterfaceRequestor *ctx, nsICRLInfo *crl
 					      GTK_STOCK_OK, GTK_RESPONSE_OK,
 					      (char *) NULL);
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate Revocation List Imported"));
 
 	/* Needed because gparent == NULL always because of mozilla sucks */
@@ -1229,7 +1230,7 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
 		gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 	}
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate Properties"));
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
@@ -1580,7 +1581,7 @@ GtkNSSDialogs::ChooseToken (nsIInterfaceRequestor *aContext,
 		   GTK_BUTTONS_CANCEL,
 		   _("Please select a token:"));
 
-  gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
   GtkWidget *combo = gtk_combo_box_new_text ();
   for (PRUint32 i = 0; i < count; ++i) {
@@ -1667,7 +1668,7 @@ GtkNSSDialogs::ConfirmKeyEscrow (nsIX509Cert *aEscrowAuthority,
        "It is strongly recommended not to allow it."),
      NS_ConvertUTF16toUTF8 (commonName).get ());
 
-  gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
   GtkWidget *button = gtk_dialog_add_button (GTK_DIALOG (dialog),
 					     _("_Reject"),
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index 2d4b63135..29d6c5511 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -47,6 +47,7 @@
 
 #include "ephy-debug.h"
 #include "ephy-gui.h"
+#include "ephy-stock-icons.h"
 
 #include "AutoJSContextStack.h"
 #include "AutoWindowModalState.h"
@@ -160,7 +161,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx,
 					     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_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index c5091046b..3d9ee5962 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -51,6 +51,8 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkvbox.h>
 
+#include "ephy-stock-icons.h"
+
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
 #include <nsIInterfaceRequestor.h>
@@ -264,7 +266,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext,
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), aDefaultResponse);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), aTitle);
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 	int response = gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);