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-encoding-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-encoding-menu.c')
| -rw-r--r-- | src/ephy-encoding-menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index 6e44952d6..d9769e87b 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -223,7 +223,7 @@ build_group (GtkActionGroup *action_group, gtk_action_group_add_action (action_group, action); g_object_unref (action); - tmp = g_strdup_printf ("<submenu name=\"%sItem\" verb=\"%s\">\n", + tmp = g_strdup_printf ("<menu name=\"%sItem\" action=\"%s\">\n", verb, verb); xml_string = g_string_append (xml_string, tmp); g_free (tmp); @@ -252,7 +252,7 @@ build_encoding (EphyEncodingMenu *menu, gtk_action_group_add_action (action_group, action); g_object_unref (action); - tmp = g_strdup_printf ("<menuitem name=\"%sItem\" verb=\"%s\"/>\n", + tmp = g_strdup_printf ("<menuitem name=\"%sItem\" action=\"%s\"/>\n", verb, verb); xml_string = g_string_append (xml_string, tmp); @@ -279,9 +279,9 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm) ephy_embed_single_get_language_groups (single, &groups); xml = g_string_new (NULL); - g_string_append (xml, "<Root><menu><submenu name=\"ViewMenu\">" + g_string_append (xml, "<ui><menubar><menu name=\"ViewMenu\">" "<placeholder name=\"ViewEncodingsPlaceholder\">" - "<submenu name=\"ViewEncodingMenu\" verb=\"ViewEncoding\">"); + "<menu name=\"ViewEncodingMenu\" action=\"ViewEncoding\">"); p->action_group = gtk_action_group_new ("EncodingActions"); gtk_ui_manager_insert_action_group (merge, p->action_group, 0); @@ -305,13 +305,13 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm) g_list_foreach (encodings, (GFunc) encoding_info_free, NULL); g_list_free (encodings); - g_string_append (xml, "</submenu>"); + g_string_append (xml, "</menu>"); } g_list_foreach (groups, (GFunc) language_group_info_free, NULL); g_list_free (groups); - g_string_append (xml, "</submenu></placeholder></submenu></menu></Root>"); + g_string_append (xml, "</menu></placeholder></menu></menubar></ui>"); gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL); |