Set window icon.

2004-10-04  Christian Persch  <chpe@cvs.gnome.org>

	* src/bookmarks/ephy-bookmark-properties.c: (set_window_icon),
	(ephy_bookmark_properties_get_node):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmarks_editor_construct):
	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_construct),
	(duplicate_dialog_construct):
	* src/ephy-history-window.c: (ephy_history_window_construct):
	* src/window-commands.c: (window_cmd_edit_toolbar):

	Set window icon.

6 files changed, 28 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index c2a290e76..b4c2a63bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2004-10-04  Christian Persch  <chpe@cvs.gnome.org>
 
+	* src/bookmarks/ephy-bookmark-properties.c: (set_window_icon),
+	(ephy_bookmark_properties_get_node):
+	* src/bookmarks/ephy-bookmarks-editor.c:
+	(ephy_bookmarks_editor_construct):
+	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_construct),
+	(duplicate_dialog_construct):
+	* src/ephy-history-window.c: (ephy_history_window_construct):
+	* src/window-commands.c: (window_cmd_edit_toolbar):
+
+	Set window icon.
+
+2004-10-04  Christian Persch  <chpe@cvs.gnome.org>
+
 	* lib/ephy-file-chooser.c: (ephy_file_chooser_constructor):
 
 	Set ephy icon as window icon.
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index d72482a65..6c92b6e88 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -280,30 +280,28 @@ set_window_icon (EphyBookmarkProperties *editor)
 	GdkPixbuf *icon = NULL;
 
 	cache = EPHY_FAVICON_CACHE
-		(ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell)));
+		(ephy_embed_shell_get_favicon_cache (embed_shell));
 	icon_location = ephy_node_get_property_string
 		(editor->priv->bookmark, EPHY_NODE_BMK_PROP_ICON);
 
 	LOG ("Get favicon for %s", icon_location ? icon_location : "None")
 
-	if (icon_location)
+	if (icon_location != NULL)
 	{
 		icon = ephy_favicon_cache_get (cache, icon_location);
 	}
 
-	else
-	{
-		icon = gtk_widget_render_icon (GTK_WIDGET (editor),
-					       GTK_STOCK_PROPERTIES,
-					       GTK_ICON_SIZE_MENU,
-					       NULL);
-	}
-
 	if (icon != NULL)
 	{
 		gtk_window_set_icon (GTK_WINDOW (editor), icon);
 		g_object_unref (icon);
 	}
+	else
+	{
+		gtk_window_set_icon_name (GTK_WINDOW (editor),
+					  GTK_STOCK_PROPERTIES);
+	}
+
 }
 
 static void
@@ -460,4 +458,3 @@ ephy_bookmark_properties_get_node (EphyBookmarkProperties *properties)
 {
 	return properties->priv->bookmark;
 }
-
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 71ca3934a..412ced923 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1413,16 +1413,10 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 	EphyNode *node;
 	GtkUIManager *ui_merge;
 	GtkActionGroup *action_group;
-	GdkPixbuf *icon;
 	int col_id, details_value;
 
 	gtk_window_set_title (GTK_WINDOW (editor), _("Bookmarks"));
-
-	icon = gtk_widget_render_icon (GTK_WIDGET (editor), 
-				       EPHY_STOCK_BOOKMARKS,
-				       GTK_ICON_SIZE_MENU,
-				       NULL);
-	gtk_window_set_icon (GTK_WINDOW(editor), icon);
+	gtk_window_set_icon_name (GTK_WINDOW (editor), EPHY_STOCK_BOOKMARKS);
 
 	g_signal_connect (editor, "delete_event",
 			  G_CALLBACK (delete_event_cb), NULL);
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 5897a23d1..2b6aaf03f 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -263,8 +263,6 @@ build_editing_table (EphyNewBookmark *editor)
 static void
 ephy_new_bookmark_construct (EphyNewBookmark *editor)
 {
-	GdkPixbuf *icon;
-
 	ephy_state_add_window (GTK_WIDGET(editor),
 			       "new_bookmark",
 		               280, 240,
@@ -272,12 +270,7 @@ ephy_new_bookmark_construct (EphyNewBookmark *editor)
 
 	gtk_window_set_title (GTK_WINDOW (editor),
 			      _("Add Bookmark"));
-	icon = gtk_widget_render_icon (GTK_WIDGET (editor),
-				       STOCK_ADD_BOOKMARK,
-				       GTK_ICON_SIZE_MENU,
-				       NULL);
-	gtk_window_set_icon (GTK_WINDOW (editor), icon);
-	g_object_unref(icon);
+	gtk_window_set_icon_name (GTK_WINDOW (editor), STOCK_ADD_BOOKMARK);
 
 	gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
@@ -325,7 +318,9 @@ duplicate_dialog_construct (GtkWindow *parent,
 					      GTK_STOCK_OK,
 					      GTK_RESPONSE_OK,
 					      NULL);
-	
+
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index c0054d1e6..ba21bb048 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -1195,16 +1195,10 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	EphyNode *node;
 	GtkUIManager *ui_merge;
 	GtkActionGroup *action_group;
-	GdkPixbuf *icon;
 	int col_id, details_value;
 
 	gtk_window_set_title (GTK_WINDOW (editor), _("History"));
-
-	icon = gtk_widget_render_icon (GTK_WIDGET (editor), 
-				       EPHY_STOCK_HISTORY,
-				       GTK_ICON_SIZE_MENU,
-				       NULL);
-	gtk_window_set_icon (GTK_WINDOW(editor), icon);
+	gtk_window_set_icon_name (GTK_WINDOW (editor), EPHY_STOCK_HISTORY);
 
 	g_signal_connect (editor, "delete_event",
 			  G_CALLBACK (delete_event_cb), NULL);
diff --git a/src/window-commands.c b/src/window-commands.c
index 61bf40b67..31639b77e 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -881,6 +881,7 @@ window_cmd_edit_toolbar (GtkAction *action,
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor"));
         gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
 	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
 
 	editor = egg_toolbar_editor_new (GTK_UI_MANAGER (ephy_window_get_ui_manager (window)), model);
 	egg_toolbar_editor_load_actions (EGG_TOOLBAR_EDITOR (editor),