aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--lib/ephy-gui.c5
-rw-r--r--src/ephy-window.c10
3 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b4c2a63bb..a6343cbce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2004-10-04 Christian Persch <chpe@cvs.gnome.org>
+ * lib/ephy-gui.c: (ephy_gui_menu_position_tree_selection),
+ (ephy_gui_confirm_overwrite_file):
+ * src/ephy-window.c: (confirm_close_with_modified_forms),
+ (ephy_window_init):
+
+ 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:
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index fe340bcc5..03ccab5f6 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -87,7 +87,8 @@ ephy_gui_menu_position_tree_selection (GtkMenu *menu,
gtk_tree_view_get_cell_area (tree_view, selected_rows->data,
NULL, &cell_rect);
- *y += CLAMP (cell_rect.y, 0, widget->allocation.height);
+
+ *y += CLAMP (cell_rect.y + cell_rect.height, 0, widget->allocation.height);
g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL);
g_list_free (selected_rows);
@@ -161,6 +162,8 @@ ephy_gui_confirm_overwrite_file (GtkWidget *parent, const char *filename)
GTK_RESPONSE_CANCEL,
_("_Overwrite"), GTK_RESPONSE_ACCEPT,
NULL);
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
+
hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 12);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 3b2d8a12a..f833e5365 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -678,7 +678,9 @@ confirm_close_with_modified_forms (EphyWindow *window)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Close _Document"), 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);
@@ -2201,9 +2203,9 @@ ephy_window_init (EphyWindow *window)
gtk_widget_show (GTK_WIDGET (window->priv->notebook));
window->priv->statusbar = ephy_statusbar_new ();
- gtk_box_pack_start (GTK_BOX (window->priv->main_vbox),
- GTK_WIDGET (window->priv->statusbar),
- FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (window->priv->main_vbox),
+ GTK_WIDGET (window->priv->statusbar),
+ FALSE, TRUE, 0);
window->priv->tab_message_cid = gtk_statusbar_get_context_id
(GTK_STATUSBAR (window->priv->statusbar), "tab_message");
window->priv->help_message_cid = gtk_statusbar_get_context_id