diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/e-composer-actions.c | 4 | ||||
| -rw-r--r-- | composer/e-composer-private.c | 2 | ||||
| -rw-r--r-- | composer/evolution-composer.ui | 16 |
3 files changed, 9 insertions, 13 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 7332c93aad..d8a911cd37 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -346,9 +346,9 @@ static GtkActionEntry entries[] = { NULL, NULL }, - { "security-menu", + { "options-menu", NULL, - N_("_Security"), + N_("_Options"), NULL, NULL, NULL } diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 2507025b93..2cab3bab0c 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -29,7 +29,7 @@ composer_setup_charset_menu (EMsgComposer *composer) guint merge_id; ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer)); - path = "/main-menu/edit-menu/pre-spell-check/charset-menu"; + path = "/main-menu/options-menu/charset-menu"; merge_id = gtk_ui_manager_new_merge_id (ui_manager); list = gtk_action_group_list_actions (composer->priv->charset_actions); diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui index f0e9c01de9..3b1fee7a72 100644 --- a/composer/evolution-composer.ui +++ b/composer/evolution-composer.ui @@ -20,12 +20,6 @@ <menuitem action='close'/> </menu> </placeholder> - <menu action='edit-menu'> - <placeholder name='pre-spell-check'> - <menu action='charset-menu'/> - <separator/> - </placeholder> - </menu> <placeholder name='pre-insert-menu'> <menu action='view-menu'> <menuitem action='view-from'/> @@ -42,15 +36,17 @@ <placeholder name='send-options'/> <separator/> </placeholder> - <separator/> - <menuitem action='request-read-receipt'/> - <menuitem action='prioritize-message'/> </menu> - <menu action='security-menu'> + <menu action='options-menu'> <menuitem action='pgp-sign'/> <menuitem action='pgp-encrypt'/> <menuitem action='smime-sign'/> <menuitem action='smime-encrypt'/> + <separator/> + <menuitem action='request-read-receipt'/> + <menuitem action='prioritize-message'/> + <separator/> + <menu action='charset-menu'/> </menu> </menubar> <toolbar name='main-toolbar'> |