aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--data/ui/epiphany-bookmark-editor-ui.xml.in6
-rw-r--r--data/ui/epiphany-history-window-ui.xml.in6
-rw-r--r--src/window-commands.c5
4 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 1538a8fcc..44b441a4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2003-05-03 Marco Pesenti Gritti <marco@it.gnome.org>
+ * data/ui/epiphany-bookmark-editor-ui.xml.in:
+ * data/ui/epiphany-history-window-ui.xml.in:
+
+ Hide view menus in the xml, not working.
+
+ * src/window-commands.c: (toolbar_editor_destroy_cb):
+
+ Update ui after tb editing, so location is not lost.
+
+2003-05-03 Marco Pesenti Gritti <marco@it.gnome.org>
+
* src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init),
(gnv_bonobo_control_activate_cb):
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml.in b/data/ui/epiphany-bookmark-editor-ui.xml.in
index 5a2590d79..91ebbb21c 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml.in
+++ b/data/ui/epiphany-bookmark-editor-ui.xml.in
@@ -23,12 +23,6 @@
<menuitem name="EditSelectAll" verb="SelectAll"/>
</submenu>
-<submenu name="ViewMenu" verb="View">
- <menuitem name="ViewTitle" verb="ViewTitle"/>
- <menuitem name="ViewLocation" verb="ViewLocation"/>
- <menuitem name="ViewTitleLocation" verb="ViewTitleLocation"/>
-</submenu>
-
<submenu name="HelpMenu" verb="Help">
<menuitem name="HelpContents" verb="HelpContents"/>
<menuitem name="HelpAbout" verb="HelpAbout"/>
diff --git a/data/ui/epiphany-history-window-ui.xml.in b/data/ui/epiphany-history-window-ui.xml.in
index 17eb4390e..e2a5e0322 100644
--- a/data/ui/epiphany-history-window-ui.xml.in
+++ b/data/ui/epiphany-history-window-ui.xml.in
@@ -20,12 +20,6 @@
<menuitem name="EditClear" verb="Clear"/>
</submenu>
-<submenu name="ViewMenu" verb="View">
- <menuitem name="ViewTitle" verb="ViewTitle"/>
- <menuitem name="ViewLocation" verb="ViewLocation"/>
- <menuitem name="ViewTitleLocation" verb="ViewTitleLocation"/>
-</submenu>
-
<submenu name="HelpMenu" verb="Help">
<menuitem name="HelpContents" verb="HelpContents"/>
<menuitem name="HelpAbout" verb="HelpAbout"/>
diff --git a/src/window-commands.c b/src/window-commands.c
index ff7e55d15..12986e71e 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -648,7 +648,12 @@ static void
toolbar_editor_destroy_cb (GtkWidget *tbe,
Toolbar *t)
{
+ GtkWidget *window;
+
+ window = gtk_widget_get_toplevel (GTK_WIDGET (t));
+
egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR (t), FALSE);
+ ephy_window_update_all_controls (EPHY_WINDOW (window));
}
static void