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/bookmarks | |
| 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/bookmarks')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-menu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c index b34056ac6..f2d4a73c4 100644 --- a/src/bookmarks/ephy-bookmarks-menu.c +++ b/src/bookmarks/ephy-bookmarks-menu.c @@ -193,7 +193,7 @@ add_bookmarks_menu (EphyBookmarksMenu *menu, EphyNode *node, GString *xml) g_string_append (xml, "<menuitem name=\""); g_string_append (xml, EMPTY_ACTION_NAME"Menu"); g_string_append (xml, "Menu"); - g_string_append (xml, "\" verb=\""); + g_string_append (xml, "\" action=\""); g_string_append (xml, EMPTY_ACTION_NAME); g_string_append (xml, "\"/>\n"); } @@ -230,7 +230,7 @@ add_bookmarks_menu (EphyBookmarksMenu *menu, EphyNode *node, GString *xml) g_string_append (xml, "<menuitem name=\""); g_string_append (xml, verb); g_string_append (xml, "Menu"); - g_string_append (xml, "\" verb=\""); + g_string_append (xml, "\" action=\""); g_string_append (xml, verb); g_string_append (xml, "\"/>\n"); @@ -267,7 +267,7 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) children = ephy_node_get_children (topics); xml = g_string_new (NULL); - g_string_append (xml, "<Root><menu><submenu name=\"BookmarksMenu\">" + g_string_append (xml, "<ui><menubar><menu name=\"BookmarksMenu\">" "<placeholder name=\"BookmarksTree\">" "<separator name=\"BookmarksSep1\"/>"); @@ -320,16 +320,16 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) gtk_action_group_add_action (p->action_group, action); g_object_unref (action); - g_string_append (xml, "<submenu name=\""); + g_string_append (xml, "<menu name=\""); g_string_append (xml, verb); g_string_append (xml, "Menu"); - g_string_append (xml, "\" verb=\""); + g_string_append (xml, "\" action=\""); g_string_append (xml, verb); g_string_append (xml, "\">\n"); add_bookmarks_menu (menu, child, xml); - g_string_append (xml, "</submenu>"); + g_string_append (xml, "</menu>"); g_free (verb); } @@ -339,7 +339,7 @@ ephy_bookmarks_menu_rebuild (EphyBookmarksMenu *menu) add_bookmarks_menu (menu, not_categorized, xml); } - g_string_append (xml, "</placeholder></submenu></menu></Root>"); + g_string_append (xml, "</placeholder></menu></menubar></ui>"); if (children->len > 0) { |