diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-03-21 08:07:49 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-03-21 08:07:49 +0800 |
commit | 364cb04c2b58a371d45a6645dbca8d9f069fba2e (patch) | |
tree | 8d74d92fcdf15bfd111f357f7dfc1213556f5355 /ui/evolution-mail-global.xml | |
parent | 9eeff8bfec181a1710b62926c64d617cce766054 (diff) | |
download | gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.tar.gz gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.tar.zst gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.zip |
Move the ComponentActionsPlaceholder into the Actions menu, instead of the
* evolution.xml: Move the ComponentActionsPlaceholder into the
Actions menu, instead of the Actions menu being in the
ComponentActionsPlaceholder.
* evolution-addressbook.xml: Updated accordingly.
* evolution-calendar.xml: Updated accordingly.
* evolution-mail-global.xml: Updated accordingly.
* evolution-mail-list.xml: Updated accordingly.
* evolution-mail-message.xml: Updated accordingly.
* evolution-mail-messagedisplay.xml: Updated accordingly.
* evolution-tasks.xml: Updated accordingly.
* evolution.xml: Add "SendReceive" verb, menu item and toolbar
button.
* evolution-mail-global.xml: Remove "MailGetSend" verb and menu
item.
* e-shell-view-menu.c (command_send_receive): New, implementation
for the "SendReceive" verb.
* e-shell.c (e_shell_send_receive): New.
* evolution-shell-component.c (impl_sendReceive): Implementation
of ShellComponent::sendReceive.
(class_init): Add the "send_receive" signal.
* evolution-shell-component.h: Added `send_receive' signal.
* Evolution-ShellComponent.idl: Added ShellComponent::sendReceive.
* component-factory.c (send_receive_cb): New, callback for the
"send_receive" signal on the EvolutionShellComponent.
(create_component): Connect.
* folder-browser-ui.c: Remove verb "MailGetSend".
* mail-callbacks.c (send_receive_mail): Removed.
* mail-send-recv.c: Remove member current_folder from struct
_send_data.
(free_send_data): No need to unref here.
(build_dialogue): Removed arg @current_folder.
(mail_send_receive): Likewise.
svn path=/trunk/; revision=16220
Diffstat (limited to 'ui/evolution-mail-global.xml')
-rw-r--r-- | ui/evolution-mail-global.xml | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml index 90589de162..36f8471354 100644 --- a/ui/evolution-mail-global.xml +++ b/ui/evolution-mail-global.xml @@ -12,10 +12,6 @@ _tip="Open a window for composing a mail message" pixtype="pixbuf"/> - <cmd name="MailGetSend" - _tip="Send queued mail and retrieve new mail" - pixtype="pixbuf"/> - <cmd name="MailStop" _tip="Cancel the current mail operation" pixtype="stock" pixname="Stop"/> @@ -72,9 +68,8 @@ </submenu> </submenu> - <placeholder name="ComponentActionsPlaceholder"> - <submenu name="Actions" _label="_Actions"> - <menuitem name="MailGetSend" verb="" _label="_Send / Receive" accel="F9"/> + <submenu name="Actions" _label="_Actions"> + <placeholder name="ComponentActionsPlaceholder"> <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/> <separator f="" name="emailglobal"/> @@ -86,8 +81,8 @@ <placeholder name="MailListActions"/> <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/> - </submenu> - </placeholder> + </placeholder> + </submenu> <submenu name="Tools"> @@ -120,10 +115,6 @@ <dockitem name="Toolbar"> - <toolitem name="MailGetSend" verb="" - _label="Send / Receive" priority="1" - pixtype="pixbuf"/> - <separator f="" name="emailglobal1"/> <placeholder name="MailMessageToolbar"/> |