Merge branch 'master' into kill-bonobo

Conflicts:
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/component-factory.c
	addressbook/gui/component/eab-composer-util.h
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/e-addressbook-model.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/e-addressbook-view.h
	addressbook/gui/widgets/eab-gui-util.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/calendar-component.c
	calendar/gui/e-cal-event.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-calendar-view.c
	calendar/gui/e-calendar-view.h
	calendar/gui/e-memo-table.c
	calendar/gui/memos-component.c
	calendar/gui/tasks-component.c
	composer/e-composer-header-table.c
	composer/e-composer-private.h
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	composer/evolution-composer.ui
	configure.ac
	data/icons/Makefile.am
	em-format/em-format.c
	em-format/em-format.h
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/e-searching-tokenizer.c
	mail/e-searching-tokenizer.h
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html-display.h
	mail/em-mailer-prefs.c
	mail/em-message-browser.c
	plugins/vcard-inline/Makefile.am
	plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
	plugins/vcard-inline/vcard-inline.c
	shell/e-component-registry.h
	shell/e-shell-window.c
	shell/es-menu.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-filter-bar.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h

1 files changed, 0 insertions, 9 deletions

diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 0acbc44647..f90e737c24 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -127,13 +127,6 @@
      _tip="Open the selected messages in a new window"
      accel="*Control*o"/>
 
-    <cmd name="MailPost"
-     _tip="Post a message to a Public folder"/>
-
-    <cmd name="MessagePostReply"
-     _tip="Post a reply to a message in a Public folder"
-     accel=""/>
-
     <cmd name="MessageRedirect"
      _tip="Redirect (bounce) the selected message to someone"
      accel=""/>
@@ -301,7 +294,6 @@
       <submenu name="Message" _label="_Message">
         <placeholder name="MessageTopActions">
           <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
-          <menuitem name="MailPost" verb="" _label="Pos_t New Message to Folder"/>
           <menuitem name="MessageOpen" verb="" _label="_Open in New Window"/>
           <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/>
           <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/>
@@ -325,7 +317,6 @@
           <menuitem name="MessageReplySender" verb="" _label="_Reply to Sender"/>
           <menuitem name="MessageReplyList" verb="" _label="Reply to _List"/>
           <menuitem name="MessageReplyAll" verb="" _label="Reply to _All"/>
-          <menuitem name="MessagePostReply" verb="" _label="Post a Repl_y"/>
           <menuitem name="MessageForward" verb="" _label="_Forward"/>
           <submenu name="ForwardAs" _label="F_orward As...">
             <menuitem verb="MessageForwardAttached" _label="_Attached"/>