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, 4 insertions, 126 deletions

diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 915f0efb3c..6638cf7aef 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -299,104 +299,6 @@ action_smime_sign_cb (GtkToggleAction *action,
 	gtkhtml_editor_set_changed (editor, TRUE);
 }
 
-static void
-action_view_bcc_cb (GtkToggleAction *action,
-                    EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_BCC, active);
-}
-
-static void
-action_view_cc_cb (GtkToggleAction *action,
-                   EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_CC, active);
-}
-
-static void
-action_view_from_cb (GtkToggleAction *action,
-                     EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_FROM, active);
-}
-
-static void
-action_view_post_to_cb (GtkToggleAction *action,
-                        EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_POST_TO, active);
-}
-
-static void
-action_view_reply_to_cb (GtkToggleAction *action,
-                         EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_REPLY_TO, active);
-}
-
-static void
-action_view_subject_cb (GtkToggleAction *action,
-                        EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_SUBJECT, active);
-}
-
-static void
-action_view_to_cb (GtkToggleAction *action,
-                   EMsgComposer *composer)
-{
-	EComposerHeaderTable *table;
-	gboolean active;
-
-	table = e_msg_composer_get_header_table (composer);
-	active = gtk_toggle_action_get_active (action);
-
-	e_composer_header_table_set_header_visible (
-		table, E_COMPOSER_HEADER_TO, active);
-}
-
 static GtkActionEntry entries[] = {
 
 	{ "attach",
@@ -541,7 +443,7 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_Bcc Field"),
 	  NULL,
 	  N_("Toggles whether the BCC field is displayed"),
-	  G_CALLBACK (action_view_bcc_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
 	{ "view-cc",
@@ -549,7 +451,7 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_Cc Field"),
 	  NULL,
 	  N_("Toggles whether the CC field is displayed"),
-	  G_CALLBACK (action_view_cc_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
 	{ "view-from",
@@ -557,15 +459,7 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_From Field"),
 	  NULL,
 	  N_("Toggles whether the From chooser is displayed"),
-	  G_CALLBACK (action_view_from_cb),
-	  FALSE },
-
-	{ "view-post-to",
-	  NULL,
-	  N_("_Post-To Field"),
-	  NULL,
-	  N_("Toggles whether the Post-To field is displayed"),
-	  G_CALLBACK (action_view_post_to_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
 	{ "view-reply-to",
@@ -573,24 +467,8 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  N_("_Reply-To Field"),
 	  NULL,
 	  N_("Toggles whether the Reply-To field is displayed"),
-	  G_CALLBACK (action_view_reply_to_cb),
+	  NULL,  /* Handled by property bindings */
 	  FALSE },
-
-	{ "view-subject",
-	  NULL,
-	  N_("_Subject Field"),
-	  NULL,
-	  N_("Toggles whether the Subject field is displayed"),
-	  G_CALLBACK (action_view_subject_cb),
-	  FALSE },
-
-	{ "view-to",
-	  NULL,
-	  N_("_To Field"),
-	  NULL,
-	  N_("Toggles whether the To field is displayed"),
-	  G_CALLBACK (action_view_to_cb),
-	  FALSE }
 };
 
 void