Readd is_important and ensure_update, gtk now support them.

2003-09-01  Marco Pesenti Gritti  <marco@gnome.org>

        * src/bookmarks/ephy-bookmarks-editor.c:
        (ephy_bookmarks_editor_construct):
        * src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_clean):
        * src/ephy-favorites-menu.c: (ephy_favorites_menu_clean):
        * src/ephy-history-window.c: (ephy_history_window_construct):
        * src/ephy-window.c: (setup_window):
        * src/toolbar.c: (toolbar_setup_actions):

        Readd is_important and ensure_update, gtk now support them.

7 files changed, 20 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e9f4407b..12dd32a23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-01  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* src/bookmarks/ephy-bookmarks-editor.c:
+	(ephy_bookmarks_editor_construct):
+	* src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_clean):
+	* src/ephy-favorites-menu.c: (ephy_favorites_menu_clean):
+	* src/ephy-history-window.c: (ephy_history_window_construct):
+	* src/ephy-window.c: (setup_window):
+	* src/toolbar.c: (toolbar_setup_actions):
+
+	Readd is_important and ensure_update, gtk now support them.
+
 2003-08-31  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* data/ui/epiphany-history-window-ui.xml.in:
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 42f93777e..60199e983 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1238,6 +1238,8 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 				         NULL);
 	gtk_window_add_accel_group (GTK_WINDOW (editor), 
 				    gtk_ui_manager_get_accel_group (ui_merge));
+	gtk_ui_manager_ensure_update (ui_merge);
+
 	editor->priv->ui_merge = ui_merge;
 	editor->priv->action_group = action_group;
 
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index f2d4a73c4..ecc4344ca 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -97,7 +97,6 @@ ephy_bookmarks_menu_clean (EphyBookmarksMenu *menu)
 	if (p->ui_id > 0)
 	{
 		gtk_ui_manager_remove_ui (merge, p->ui_id);
-		/* FIXME gtk_ui_manager_ensure_update (merge); */
 		p->ui_id = 0;
 	}
 
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index 60e477b6f..2ba8ddac4 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -89,7 +89,6 @@ ephy_favorites_menu_clean (EphyFavoritesMenu *wrhm)
 	if (p->ui_id > 0)
 	{
 		gtk_ui_manager_remove_ui (merge, p->ui_id);
-		/* FIXME gtk_ui_manager_ensure_update (merge); */
 		p->ui_id = 0;
 	}
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index f5b26c74e..95428f753 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -974,6 +974,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	gtk_ui_manager_add_ui_from_file (ui_merge,
 				         ephy_file ("epiphany-history-window-ui.xml"),
 				         NULL);
+	gtk_ui_manager_ensure_update (ui_merge);
 	editor->priv->ui_merge = ui_merge;
 	editor->priv->action_group = action_group;
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 779fb46c8..412ce79e9 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -615,14 +615,12 @@ setup_window (EphyWindow *window)
 	action = gtk_action_group_get_action (action_group, "GoBookmarks");
 	g_object_set (action, "short_label", _("Bookmarks"), NULL);
 
-/*
 	action = gtk_action_group_get_action (action_group, "EditFind");
-	g_object_set (action, "important", TRUE, NULL);
+	g_object_set (action, "is_important", TRUE, NULL);
 	action = gtk_action_group_get_action (action_group, "GoHome");
-	g_object_set (action, "important", TRUE, NULL);
+	g_object_set (action, "is_important", TRUE, NULL);
 	action = gtk_action_group_get_action (action_group, "GoBookmarks");
-	g_object_set (action, "important", TRUE, NULL);
-*/
+	g_object_set (action, "is_important", TRUE, NULL);
 
 	action_group = gtk_action_group_new ("PopupsActions");
 	gtk_action_group_add_actions (action_group, ephy_popups_entries,
@@ -643,9 +641,7 @@ setup_window (EphyWindow *window)
 		g_clear_error (&err);
         }
 
-	/* FIXME trick to force update */
-	gtk_ui_manager_get_widget (GTK_UI_MANAGER (window->ui_merge),
-				   "/menubar");
+	gtk_ui_manager_ensure_update (GTK_UI_MANAGER (window->ui_merge));
 
 	window->priv->toolbar = toolbar_new (window);
 	gtk_widget_show (GTK_WIDGET (window->priv->toolbar));
diff --git a/src/toolbar.c b/src/toolbar.c
index 5feb68c4a..d8d693b3a 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -270,7 +270,7 @@ toolbar_setup_actions (Toolbar *t)
 			       "tooltip", _("Go back"),
 			       "window", t->priv->window,
 			       "direction", EPHY_NAVIGATION_DIRECTION_BACK,
-/*			       "important", TRUE,*/
+			       "is_important", TRUE,
 			       NULL);
 	g_signal_connect (action, "activate",
 			  G_CALLBACK (window_cmd_go_back), t->priv->window);