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, 41 insertions, 21 deletions

diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 621417eb9b..e0895c330c 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -116,71 +116,91 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/From</key>
-      <applyto>/apps/evolution/mail/composer/view/From</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_bcc</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_bcc</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Show "Bcc" field when sending a mail message</short>
+         <long>
+           Show the "Bcc" field when sending a mail message.  This is
+           controlled from the View menu when a mail account is chosen.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_cc</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_cc</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>View/From menu item is checked</short>
+         <short>Show "Cc" field when sending a mail message</short>
          <long>
-          View/From menu item is checked.
+           Show the "Cc" field when sending a mail message.  This is
+           controlled from the View menu when a mail account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/PostTo</key>
-      <applyto>/apps/evolution/mail/composer/view/PostTo</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_from</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_from</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>View/PostTo menu item is checked</short>
+         <short>Show "From" field when sending a mail message</short>
          <long>
-          View/PostTo menu item is checked.
+           Show the "From" field when sending a mail message.  This is
+           controlled from the View menu when a mail account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/ReplyTo</key>
-      <applyto>/apps/evolution/mail/composer/view/ReplyTo</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_mail_reply_to</key>
+      <applyto>/apps/evolution/mail/composer/show_mail_reply_to</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>View/ReplyTo menu item is checked</short>
+         <short>Show "Reply To" field when sending a mail message</short>
          <long>
-          View/ReplyTo menu item is checked.
+           Show the "Reply To" field when sending a mail message.  This
+           is controlled from the View menu when a mail account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/Cc</key>
-      <applyto>/apps/evolution/mail/composer/view/Cc</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_post_from</key>
+      <applyto>/apps/evolution/mail/composer/show_post_from</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
-         <short>View/Cc menu item is checked</short>
+         <short>Show "From" field when posting to a newsgroup</short>
          <long>
-          View/Cc menu item is checked.
+           Show the "From" field when posting to a newsgroup.  This is
+           controlled from the View menu when a news account is chosen.
          </long>
       </locale>
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/view/Bcc</key>
-      <applyto>/apps/evolution/mail/composer/view/Bcc</applyto>
+      <key>/schemas/apps/evolution/mail/composer/show_post_reply_to</key>
+      <applyto>/apps/evolution/mail/composer/show_post_reply_to</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>View/Bcc menu item is checked</short>
+         <short>Show "Reply To" field when posting to a newsgroup</short>
          <long>
-          View/Bcc menu item is checked.
+           Show the "Reply To" field when posting to a newsgroup.  This
+           is controlled from the View menu when a news account is chosen.
          </long>
       </locale>
     </schema>