diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-09-01 02:09:43 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-09-01 02:09:43 +0800 |
| commit | 3d58425833b6950f57fbc7578081f76befd17c14 (patch) | |
| tree | 6519448fe32147329dc7fcecf2ad2af7c9afd03f /src/ephy-tabs-menu.c | |
| parent | 9d4c55cd61f4ab24e6c153a2fe5749d17b462ddf (diff) | |
| download | gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.tar gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.tar.gz gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.tar.bz2 gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.tar.lz gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.tar.xz gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.tar.zst gsoc2013-epiphany-3d58425833b6950f57fbc7578081f76befd17c14.zip | |
Fix problems with EphyNodeView, bookmarks and history dialogs and update
2003-08-31 Marco Pesenti Gritti <marco@gnome.org>
* data/ui/epiphany-history-window-ui.xml.in:
* data/ui/epiphany-ui.xml.in:
* lib/widgets/ephy-node-view.c: (get_selection):
* src/bookmarks/ephy-bookmarks-editor.c: (add_widget),
(ephy_bookmarks_editor_construct):
* src/bookmarks/ephy-bookmarks-menu.c: (add_bookmarks_menu),
(ephy_bookmarks_menu_rebuild):
* src/ephy-encoding-menu.c: (build_group), (build_encoding),
(ephy_encoding_menu_rebuild):
* src/ephy-favorites-menu.c: (ephy_favorites_menu_rebuild):
* src/ephy-history-window.c: (add_widget),
(ephy_history_window_construct):
* src/ephy-tabs-menu.c: (ephy_tabs_menu_clean),
(ephy_tabs_menu_update):
* src/ephy-window.c: (setup_window), (ephy_window_init):
Fix problems with EphyNodeView, bookmarks and history
dialogs and update dynamic menus to the new xml format.
Diffstat (limited to 'src/ephy-tabs-menu.c')
| -rw-r--r-- | src/ephy-tabs-menu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index a7c9a265f..b294a20e0 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -167,7 +167,6 @@ ephy_tabs_menu_clean (EphyTabsMenu *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; } @@ -279,7 +278,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu) /* it's faster to preallocate, MIN is sanity check */ xml = g_string_sized_new (44 * MIN (num, 64) + 105); - g_string_append (xml, "<Root><menu><submenu name=\"TabsMenu\">" + g_string_append (xml, "<ui><menubar><menu name=\"TabsMenu\">" "<placeholder name=\"TabsOpen\">"); for (l = tabs; l != NULL; l = l->next) @@ -296,7 +295,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu) g_string_append (xml, "<menuitem name=\""); g_string_append (xml, action_name); - g_string_append (xml, "Menu\" verb=\""); + g_string_append (xml, "Menu\" action=\""); g_string_append (xml, action_name); g_string_append (xml, "\"/>\n"); @@ -305,7 +304,7 @@ ephy_tabs_menu_update (EphyTabsMenu *menu) g_list_free (tabs); - g_string_append (xml, "</placeholder></submenu></menu></Root>"); + g_string_append (xml, "</placeholder></menu></menubar></ui>"); gtk_ui_manager_insert_action_group (merge, p->action_group, 0); p->ui_id = gtk_ui_manager_add_ui_from_string |