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.

9 files changed, 21 insertions, 8 deletions

diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 5988c92d4..49077456b 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -27,6 +27,7 @@
 #include "ephy-state.h"
 #include "ephy-gui.h"
 #include "ephy-debug.h"
+#include "ephy-stock-icons.h"
 
 #include <gtk/gtkstock.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -116,7 +117,7 @@ ephy_file_chooser_constructor (GType type,
 		(GTK_FILE_CHOOSER (object), downloads_dir, NULL);
 	g_free (downloads_dir);
 
-	gtk_window_set_icon_name (GTK_WINDOW (object), "web-browser");
+	gtk_window_set_icon_name (GTK_WINDOW (object), EPHY_STOCK_EPHY);
 
 	return object;
 }
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 0b3fc7794..28fd6fcc9 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -22,6 +22,7 @@
 
 #include "ephy-gui.h"
 #include "eel-gconf-extensions.h"
+#include "ephy-stock-icons.h"
 #include "ephy-debug.h"
 
 #include <ctype.h>
@@ -297,7 +298,7 @@ ephy_gui_check_location_writable (GtkWidget *parent,
 					  "create files in this directory."));
 
 			gtk_window_set_title (GTK_WINDOW (dialog), _("Directory not Writable"));
-			gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+			gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 			if (parent != NULL)
 			{
@@ -334,7 +335,7 @@ ephy_gui_check_location_writable (GtkWidget *parent,
 				  "you don't have permission to overwrite it."));
 
 		gtk_window_set_title (GTK_WINDOW (dialog), _("Cannot Overwrite File"));
-		gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+		gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
 
 		if (parent != NULL)
 		{
diff --git a/lib/ephy-module.c b/lib/ephy-module.c
index 848a77413..97710fc08 100644
--- a/lib/ephy-module.c
+++ b/lib/ephy-module.c
@@ -139,7 +139,14 @@ ephy_module_load (GTypeModule *gmodule)
 		return FALSE;
 	}
 
-	g_assert (register_func);
+	/* symbol can still be NULL even though g_module_symbol returned TRUE */
+	if (!register_func)
+	{
+		g_warning ("Symbol 'register_module' is NULL!");
+		g_module_close (module->library);
+
+		return FALSE;
+	}
 
 	module->type = register_func (gmodule);
 
diff --git a/lib/ephy-password-dialog.c b/lib/ephy-password-dialog.c
index b1a6094f9..12ac55cfb 100644
--- a/lib/ephy-password-dialog.c
+++ b/lib/ephy-password-dialog.c
@@ -35,6 +35,7 @@
 #include "ephy-gui.h"
 #include "ephy-lib-type-builtins.h"
 #include "ephy-state.h"
+#include "ephy-stock-icons.h"
 
 #include "ephy-password-dialog.h"
 
@@ -375,7 +376,7 @@ ephy_password_dialog_constructor (GType type,
 	gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* Message has 24, we want 12 = 2 + 2 * 5 */
 
 	//	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-	gtk_window_set_icon_name (window, "web-browser");
+	gtk_window_set_icon_name (window, EPHY_STOCK_EPHY);
 
 	gtk_image_set_from_icon_name (GTK_IMAGE (message_dialog->image),
 				      GTK_STOCK_DIALOG_AUTHENTICATION,
diff --git a/lib/ephy-spell-check.c b/lib/ephy-spell-check.c
index 9d8059461..6e23dca65 100755
--- a/lib/ephy-spell-check.c
+++ b/lib/ephy-spell-check.c
@@ -43,7 +43,7 @@ enum
 	LAST_SIGNAL
 };
 
-static guint signals[LAST_SIGNAL];
+/* static guint signals[LAST_SIGNAL]; */
 static GObjectClass *parent_class;
 
 /* Helper functions */
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index b50d3ed20..220048ca8 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -23,6 +23,8 @@
 
 G_BEGIN_DECLS
 
+#define EPHY_STOCK_EPHY		   "web-browser"
+
 #define EPHY_STOCK_POPUPS	   "popup-hidden"
 #define EPHY_STOCK_HISTORY         "history-view"
 #define EPHY_STOCK_BOOKMARKS       "bookmark-view"
diff --git a/lib/widgets/.cvsignore b/lib/widgets/.cvsignore
index 20e4cb0c8..ebb9363e5 100644
--- a/lib/widgets/.cvsignore
+++ b/lib/widgets/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
 .deps
 .libs
 *.la
+testspinner
diff --git a/lib/widgets/ephy-spinner-tool-item.c b/lib/widgets/ephy-spinner-tool-item.c
index d92e7f9ed..2d72d133e 100644
--- a/lib/widgets/ephy-spinner-tool-item.c
+++ b/lib/widgets/ephy-spinner-tool-item.c
@@ -54,7 +54,7 @@ ephy_spinner_tool_item_toolbar_reconfigured (GtkToolItem *tool_item)
 
 	if (style == GTK_TOOLBAR_BOTH)
 	{
-		spinner_size = GTK_ICON_SIZE_INVALID;
+		spinner_size = GTK_ICON_SIZE_DIALOG;
 	}
 	else
 	{
diff --git a/lib/widgets/testspinner.c b/lib/widgets/testspinner.c
index f986d752f..50d9c6b62 100644
--- a/lib/widgets/testspinner.c
+++ b/lib/widgets/testspinner.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2005 Christian Persch
+ * Copyright © 2005, 2006 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by