Use stock icons instead of the files directly to set window border icons.

2003-05-19  David Bordoley  <bordoley@msu.edu>

	* embed/downloader-view.c: (downloader_view_build_ui):
	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
	* lib/ephy-stock-icons.h:
	* src/ephy-history-window.c: (ephy_history_window_construct):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmarks_editor_construct):

	Use stock icons instead of the files directly to set window
	border icons.

6 files changed, 38 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fd5eea75..b6227410c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2003-05-19  David Bordoley  <bordoley@msu.edu>
 
+	* embed/downloader-view.c: (downloader_view_build_ui):
+	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
+	* lib/ephy-stock-icons.h:
+	* src/ephy-history-window.c: (ephy_history_window_construct):
+	* src/bookmarks/ephy-bookmarks-editor.c: 
+	ephy_bookmarks_editor_construct):
+
+	Use stock icons instead of the files directly to set window
+	border icons.
+
+2003-05-19  David Bordoley  <bordoley@msu.edu>
+
 	* data/epiphany.schemas.in:
 	* data/glade/prefs-dialog.glade:
 	* lib/ephy-prefs.h:
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 7d8d411b0..bcc948276 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -27,6 +27,7 @@
 #include "ephy-embed-utils.h"
 #include "ephy-file-helpers.h"
 #include "ephy-embed-shell.h"
+#include "ephy-stock-icons.h"
 
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkliststore.h>
@@ -707,7 +708,7 @@ downloader_view_build_ui (DownloaderView *dv)
 	GtkCellRenderer *renderer;
 	GtkTreeSelection *selection;
 	GtkWidget *details_table;
-	const char *icon_path;
+	GdkPixbuf *icon;
 	EphyDialog *d = EPHY_DIALOG (dv);
 
 	ephy_dialog_construct (d,
@@ -801,8 +802,11 @@ downloader_view_build_ui (DownloaderView *dv)
 
 	priv->model = GTK_TREE_MODEL (liststore);
 
-	icon_path =  ephy_file ("epiphany-download.png");
-	gtk_window_set_icon_from_file (GTK_WINDOW(priv->window), icon_path, NULL);
+	icon = gtk_widget_render_icon (GTK_WINDOW (priv->window), 
+				       EPHY_STOCK_DOWNLOAD,
+				       GTK_ICON_SIZE_MENU,
+				       NULL);
+	gtk_window_set_icon (GTK_WINDOW(priv->window), icon);
 }
 
 void
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index c69dcc71e..7f05f0248 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -43,7 +43,8 @@ ephy_stock_icons_init (void)
 		EPHY_STOCK_NEW_TAB,
 		EPHY_STOCK_VIEWSOURCE,
 		EPHY_STOCK_SEND_LINK,
-		EPHY_STOCK_ENTRY
+		EPHY_STOCK_ENTRY,
+		EPHY_STOCK_DOWNLOAD
 	};
 
 	factory = gtk_icon_factory_new ();
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index e7b803831..85b878dc7 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -27,12 +27,13 @@ G_BEGIN_DECLS
 #define EPHY_STOCK_UNSECURE        "epiphany-unsecure"
 #define EPHY_STOCK_HISTORY         "epiphany-history"
 #define EPHY_STOCK_BOOKMARKS       "epiphany-bookmarks"
-#define EPHY_STOCK_BOOKMARK_PAGE "epiphany-bookmark-page"
+#define EPHY_STOCK_BOOKMARK_PAGE   "epiphany-bookmark-page"
 #define EPHY_STOCK_NEW_TAB         "epiphany-new-tab"
 #define EPHY_STOCK_FULLSCREEN      "epiphany-fullscreen"
 #define EPHY_STOCK_VIEWSOURCE      "epiphany-viewsource"
 #define EPHY_STOCK_SEND_LINK       "epiphany-send-link"
-#define EPHY_STOCK_ENTRY		    "epiphany-entry"
+#define EPHY_STOCK_ENTRY	   "epiphany-entry"
+#define EPHY_STOCK_DOWNLOAD	   "epiphany-download"
 
 void ephy_stock_icons_init (void);
 
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 940c7595b..a716fd9fa 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -30,7 +30,6 @@
 #include <gtk/gtkvbox.h>
 #include <gdk/gdkkeysyms.h>
 #include <bonobo/bonobo-i18n.h>
-#include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <string.h>
 
@@ -53,6 +52,7 @@
 #include "window-commands.h"
 #include "ephy-debug.h"
 #include "ephy-gui.h"
+#include "ephy-stock-icons.h"
 
 static GtkTargetEntry topic_drag_dest_types [] =
 {
@@ -1114,14 +1114,16 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 	EggMenuMerge *ui_merge;
 	EggActionGroup *action_group;
 	EggAction *action;
-	const char *icon_path;
+	GdkPixbuf *icon;
 	int i;
 
 	gtk_window_set_title (GTK_WINDOW (editor), _("Bookmarks"));
 
-	icon_path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
-					       "epiphany-bookmarks.png", TRUE, NULL);
-	gtk_window_set_icon_from_file (GTK_WINDOW (editor), icon_path, NULL);
+	icon = gtk_widget_render_icon (GTK_WINDOW (editor), 
+				       EPHY_STOCK_BOOKMARKS,
+				       GTK_ICON_SIZE_MENU,
+				       NULL);
+	gtk_window_set_icon (GTK_WINDOW(editor), icon);
 
 	g_signal_connect (editor, "delete_event",
 			  G_CALLBACK (delete_event_cb), NULL);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index cd90e330e..9199a034a 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -49,6 +49,7 @@
 #include "ephy-stock-icons.h"
 #include "ephy-gui.h"
 #include "toolbar.h"
+#include "ephy-stock-icons.h"
 
 static GtkTargetEntry page_drag_types [] =
 {
@@ -945,13 +946,16 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	EggMenuMerge *ui_merge;
 	EggActionGroup *action_group;
 	EggAction *action;
-	const char *icon_path;
+	GdkPixbuf *icon;
 	int i;
 
 	gtk_window_set_title (GTK_WINDOW (editor), _("History"));
 
-	icon_path = ephy_file ("epiphany-history.png");
-	gtk_window_set_icon_from_file (GTK_WINDOW (editor), icon_path, NULL);
+	icon = gtk_widget_render_icon (GTK_WINDOW (editor), 
+				       EPHY_STOCK_HISTORY,
+				       GTK_ICON_SIZE_MENU,
+				       NULL);
+	gtk_window_set_icon (GTK_WINDOW(editor), icon);
 
 	g_signal_connect (editor, "delete_event",
 			  G_CALLBACK (delete_event_cb), NULL);