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

1 files changed, 25 insertions, 0 deletions

diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index c72f899bd5..58b2d8790c 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -271,6 +271,20 @@ command_toggle_shortcut_bar (BonoboUIComponent           *component,
 
 
 static void
+command_send_receive (BonoboUIComponent *ui_component,
+		      void *data,
+		      const char *path)
+{
+	EShellView *shell_view;
+	EShell *shell;
+
+	shell_view = E_SHELL_VIEW (data);
+	shell = e_shell_view_get_shell (shell_view);
+
+	e_shell_send_receive (shell);
+}
+
+static void
 command_new_folder (BonoboUIComponent *uih,
 		    void *data,
 		    const char *path)
@@ -645,6 +659,12 @@ BonoboUIVerb folder_verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
+BonoboUIVerb actions_verbs[] = {
+	BONOBO_UI_VERB ("SendReceive", command_send_receive),
+
+	BONOBO_UI_VERB_END
+};
+
 BonoboUIVerb tools_verbs[] = {
 	BONOBO_UI_VERB ("Settings", command_settings),
 
@@ -660,11 +680,15 @@ BonoboUIVerb help_verbs [] = {
 };
 
 static EPixmap pixmaps [] = {
+	E_PIXMAP ("/commands/SendReceive",      "send-receive.xpm"),
+
 	E_PIXMAP ("/menu/File/New/Folder",	"folder.xpm"),
 	E_PIXMAP ("/menu/File/Folder/Folder",	"folder.xpm"),
 	E_PIXMAP ("/menu/File/FileImporter",	"import.xpm"),
 	E_PIXMAP ("/menu/File/ToggleOffline",	"work_offline.xpm"),
 
+	E_PIXMAP ("/Toolbar/SendReceive",       "buttons/send-24-receive.png"),
+
 	E_PIXMAP_END
 };
 
@@ -785,6 +809,7 @@ e_shell_view_menu_setup (EShellView *shell_view)
 	bonobo_ui_component_add_verb_list_with_data (uic, folder_verbs, shell_view);
 	bonobo_ui_component_add_verb_list_with_data (uic, new_verbs, shell_view);
 
+	bonobo_ui_component_add_verb_list_with_data (uic, actions_verbs, shell_view);
 	bonobo_ui_component_add_verb_list_with_data (uic, tools_verbs, shell_view);
 
 	bonobo_ui_component_add_verb_list (uic, help_verbs);