From 53a85cd93b24a7fd98a7ae205fd9e20a4d54e71a Mon Sep 17 00:00:00 2001
From: David Bordoley <bordoley@msu.edu>
Date: Mon, 24 Mar 2003 20:08:08 +0000
Subject: New epiphany-bookmark-page stock image. I'm not at all attached to
 this

2003-03-24  David Bordoley <bordoley@msu.edu>

	* data/art/epiphany-bookmark-page.png: (New file):
	* data/art/Makefile.am:
	* lib/ephy-stock-icons.c:
	* lib/ephy-stock-icons.h:
	New epiphany-bookmark-page stock image. I'm not at all attached to this icon,
	if you can make a better one, please do :)

	* data/glade/epiphany.glade:
	Change button ordering to [clear][cancel][jump to].

	* embed/find-dialog.c:
	Use GTK_STOCK_FIND for the window border icon.

	* embed/print-dialog.c:
	Use GTK_STOCK_PRINT for the window border icon.

	* src/bookmarks/ephy-new-bookmark.c:
	Use EPHY_STOCK_BOOKMARK_PAGE for the window icon.
	s/add bookmark/new bookmark for the window title.

	* src/bookmarks/ephy-bookmark-properties.c: (set_window_icon),
	(update_window_title):
	New functions. Dynamically set the property window title base on the
	bookmark title. Use the favicon icon if available for the window icon, otherwise use
	GTK_STOCK_PROPERTIES.

	* src/window-commands.c:
	Use GNOME_STOCK_ABOUT for the about window icon.

	* src/prefs-dialog.c:
	USE GTK_STOCK_PREFERENCES for the window icon.

	* src/history-dialog.c:
	Use epiphany-history.png for the window border icon.

	* src/ephy-window.c:
	Use EPHY_STOCK_BOOKMARK_PAGE for the boomark page/link menu items.
---
 src/history-dialog.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/history-dialog.c')

diff --git a/src/history-dialog.c b/src/history-dialog.c
index 70710252a..6756f14c3 100755
--- a/src/history-dialog.c
+++ b/src/history-dialog.c
@@ -19,6 +19,7 @@
 #include "history-dialog.h"
 #include "ephy-shell.h"
 #include "ephy-embed-shell.h"
+#include "ephy-file-helpers.h"
 #include "ephy-string.h"
 #include "ephy-gui.h"
 #include "ephy-dnd.h"
@@ -69,6 +70,7 @@ static GObjectClass *parent_class = NULL;
 
 struct HistoryDialogPrivate
 {
+	GtkWidget *window;
 	EphyHistory *gh;
 	EphyNode *root;
 	EphyNode *pages;
@@ -91,6 +93,7 @@ enum
 
 enum
 {
+	PROP_WINDOW,
 	PROP_TREEVIEW,
 	PROP_WORD,
 	PROP_TIME,
@@ -100,6 +103,7 @@ enum
 static const
 EphyDialogProperty properties [] =
 {
+	{ PROP_WINDOW, "history_dialog", NULL, PT_NORMAL, NULL },
 	{ PROP_TREEVIEW, "history_treeview", NULL, PT_NORMAL, NULL },
 	{ PROP_WORD, "history_entry", CONF_HISTORY_SEARCH_TEXT, PT_NORMAL, NULL },
 	{ PROP_TIME, "history_time_optionmenu", CONF_HISTORY_SEARCH_TIME, PT_NORMAL, NULL },
@@ -402,6 +406,8 @@ static void
 history_dialog_set_embedded (HistoryDialog *dialog,
 			     gboolean embedded)
 {
+	const char *icon_path;
+	
 	dialog->priv->embedded = embedded;
 
 	ephy_dialog_construct (EPHY_DIALOG (dialog),
@@ -410,11 +416,15 @@ history_dialog_set_embedded (HistoryDialog *dialog,
 			       embedded ?
 			       "history_dock_box" :
 			       "history_dialog");
+	dialog->priv->window = ephy_dialog_get_control (EPHY_DIALOG (dialog), PROP_WINDOW);
 	dialog->priv->go_button = ephy_dialog_get_control (EPHY_DIALOG (dialog), PROP_GO_BUTTON);
-
 	dialog->priv->treeview = GTK_TREE_VIEW (
 				 ephy_dialog_get_control (EPHY_DIALOG(dialog),
 							    PROP_TREEVIEW));
+	
+	icon_path =  ephy_file ("epiphany-history.png");
+	gtk_window_set_icon_from_file (GTK_WINDOW(dialog->priv->window), icon_path, NULL);
+
 	history_dialog_setup_view (dialog);
 	history_dialog_setup_filter (dialog);
 }
-- 
cgit v1.2.3